Changed controller names. Fixes #29
Automated Grunt build
Merge pull request #30 from Wildhoney/change-controller-names

Change controller names