add oauth
fix merge conflicts
add more bootstrap
add vimeo