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

Conflicts:
	pydata.db