Cleanup
Merge branch 'master' of github.com:mozkeeler/sunlight into cleanup
Clean up
Fix up test
Merge pull request #30 from mozkeeler/cleanup

merge Cleanup