reset dependencies
Merge pull request #9 from baconz/master

added wsgi back in
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
working with fewer dependencies
cleaned up excess files
started on pcvcore/models
added south and initial migration for pcvblog
added braces to the requirements
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	apps/pcvblog/models.py
	peacecorps/settings/common.py
finished pcvcore model
Merge branch 'master' of 10.242.5.180:peacecorps
add swp files to .gitignore
fixed model eel errors
saving before merge
removing database
Merge branch 'master' of localhost:peacecorps
fixed merge conflicts?
add logo
update pcvcore models to use text rather than char fields where appropriate
did migration for textfield change