Merge branch 'master' into tox

Fixed tox.ini conflict and updated .gitignore.
Merge branch 'tox' of ssh://github.com/pbs/django-cms-dbtemplates into tox

Fixed tox.ini last commit whitespace.