added bootstrap-sass to asset pipeline, tweaked for heroku
Merge branch 'development' of https://github.com/margaretblue/peekinonme into development