Update base.py
Merge branch 'master' of github.com:tind/frigg into setup

Conflicts:
	frigg/settings/base.py