add updated db and image
Merge branch 'bos2013' of github.com:pydata/conference into bos2013
Merge branch 'bos2013' of github.com:pydata/conference into bos2013
Merge branch 'bos2013' of github.com:pydata/conference into bos2013
remove line that was causing errors when starting server