htaccess redirect
Merge remote branch 'origin/master'
ignore site-specific htaccess
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
update ruby in travis file
update ffi
not specify ruby version in gemfile  -- silly hack that is not official for anybody
Merge remote branch 'origin/master'
cap files installed
deploy steps for capistrano, also keep migrations in the repo
updated rubyracer
more generic setup and template files approach
conditionally compile assets
cap deploy updates
deploy works start to finish in staging
updates to gitignore file
adding db/structure.sql file
merging master
merging .gitignore changes