added bootstrap for ember-cli
added bootstrap-sass for ember-cli
fixed bootstrap dependency merge conflict in package.json
forgot to merge http_mock_setup; will merge with master
fixed merge conflict in bower.json
cleaned up some files