Upgrade to Django 1.6

Conflicts:

	conf/buildout.cfg
Django 1.6 transactions fixes
Rename get_query_set to get_queryset