setup.py fix
django 1.7 initial migrations
Merge branch 'treebeard_migrations' into treebeard
migrations and django 1.7 migrations fixed or added