updated more
Merge branch 'master' of github.com:jezdez/jezdez.com

Conflicts:
	requirements.txt
Updated some more deps.
Merge branch 'master' of github.com:jezdez/jezdez.com
Updated deps.