Merge pull request #135 from cloudspace/67567950_code_cleanup

67567950 code cleanup
Merge branch 'master' of https://github.com/cloudspace/angular.crunchinator.com into 67567950_code_cleanup