pushing up db changes
Merge branch 'master' of github.com:pydata/conference