Merge branch 'master' into beta
generated with sails v0.10
Merged beta
Cleanup after merge
Cleaned up everything.
Updated Change log
Merge pull request #3 from chuck-aka-ben/beta

v0.0.6