forgot to set the branch
new nginx conf
Merge branch 'capistrano' of github.com:akingabramson/brunchbase into capistrano