Merge branch 'master' of https://github.com/esoergel/peacecorps
Merge branch 'master' of https://github.com/esoergel/peacecorps
added tagging to blog and some cleanup
Merge branch 'master' of https://github.com/esoergel/peacecorps

Conflicts:
	apps/pcvblog/models.py
Merge pull request #30 from baconz/master

Added tagging to blog