Fix formatting and update copyright

Author Scott Yeskie <scott@yeskie.com>
Author date 2016-07-01 00:34:43
Author local date 2016-06-30 17:34:43 -0700
Committer Scott Yeskie <scott@yeskie.com>
Committer date 2016-07-01 00:34:43
Committer local date 2016-06-30 17:34:43 -0700
Commit 7145acd905278749a93ac455ab0dbf6d6c490ae5
Tree cb2137b22e1f2b927f3d70951d83d4f1da57b34b
Parent 31313242cdc19a115197e4c7c79361603ca5527c
Fix formatting and update copyright