Refactogin a lot stuff
Merge remote-tracking branch 'origin/bum' into bum
Updating application.js to backbone