Separated out james_controller.js from the rest of the controllers
Merged with changes from Jason and Craig
Merged changes from Ben
Reorganized controllers into app/js/controllers/ folder
Merge remote-tracking branch 'origin/master'