Trimmed more fat from Application.js
Abstracted more $rootScope variables
Merge remote-tracking branch 'origin/master'