Moved static stylesheets to vendor
Removed duplicate bootstrap css
Merge branch 'master' into develop
Need to serve static assets
Was still using gem verison of bootstrap, fixed
add layout