remove commented out package
upgraded versions of some packages
Merge branch 'master' of github.com:dgrant/www-pommedapi

Conflicts:
	requirements.txt