clean up/comments
Merge branch 'master' of github.com:creativeslice/goldenegg