Merge branch 'master' into mytardis-api
commit in the middle of overhaul. completed: ExperimentACLs are request-independent, IP based auth is removed, groups now live in user object, not in request object
A Django-compatible auth backend for object level permissions.
new authorisation system based on updated ACLs

ObjectACLs can be applied to any object using the Django ContentType
framework. Documentation will be available soon.

Permissions for specific objects can now be checked via the
Django-standard user.has_perm() call. Details will be in docs, too.

Code cleanup opportunities provided by these changes have not been
fully realised yet. Something to look forward to.
re-enabled tokens in the context of the overhauled auth system
some minor fixes and documentation of the changes in auth
docs formatting
docs formatting
Merge branch 'auth-overhaul' into mytardis-api

Conflicts:
	tardis/settings_changeme.py
bug fix for overlooked experimentacl uses
missed a couple of experimentacl references
Update README.rst

Updated the link to issue tracker.
Merge pull request #274 from guillaumeprevost/master

Updated the link to issue tracker
Merge pull request #272 from grischa/master

For times when temporary files for downloads are too big for /tmp
bug fix in migrations
bug fixes and test fixes
trying to fix setuptools issue, step 1 update bootstrap.py
trying to fix setuptools issue by requesting newer version
update setuptools on travis before build
removing outdated links in setup.py