Merge pull request #18 from rvaiya/beautifyfix

Beautify fix
Cleaned up controllers.

  - Removed controller dependence on $scope
Fixed styling issues pointed out by Varun, changed "scope" to "vm" in controllers
Merge pull request #19 from rvaiya/refactor

Cleaned up controllers.
adjust karma for CI
fixed beautify task
Fixed beautify so it now uses jsbeautifyrc
Merge remote-tracking branch 'upstream/master' into beautifyfix

Conflicts:
	gulpfile.js