Getting latest changes onto master
Merge pull request #29 from legitco/develop

Cleanup and README changes
Merge remote-tracking branch 'upstream' into develop
Update things for angular