Fix formatting and imports on all files with netbeans. Also bug 261.
Merge pull request #28 from rmtmckenzie/Morgan

Fix formatting and imports on all files with netbeans. Also bug 261.