I should have put this in aaaages ago
Fixed __str__ in py3 instead of  __unicode__
Use pygments for syntax highlighting
Merge branch 'master' of github.com:narthollis/net_narthollis_www

Conflicts:
	requirements.txt