changing db to heroku
Merge branch 'master' of heroku.com:ev-institute

Conflicts:
	evi/__init__.py
removed odd lines from init