Merge branch 'bootstrap-3' into ui-refactor
Resolved conflicts
Removed backbone.localStorage shite
Fix up bower reps and use symlinks