update settings for more heroku support

Conflicts:
	settings.py
requirements for heroku
add heroku procfile
added heroku runtime
new giphy search
updated google plugin to use the new json module
rename db
Merge branch 'master' of github.com:com4/warmachine

Conflicts:
	Procfile
	settings.py