Clean up angular branch and merge it into master

[benglass]

Master was using backbone, we are switched over fully to angular at this point so angular branch needs to be cleaned up and merged into master.

• [x] Move js files out of angular subfolder
• [x] Remove old/unused javascript
• [x] Merge angular with master