Merge branch 'master' of https://github.com/oracal/repowatcher

Conflicts:
	repowatcher/settings.py
Merge branch 'master' of https://github.com/oracal/repowatcher