don't remember why I added this
updated requirements
migrate from south to 1.7 migrations
Merge branch 'master' of github.com:craigatron/acaadmin