oops, added pg to gemfile
Merge branch 'master' of github.com:larubyconf/site-2013
2014 refresh