Add new piwik url
Fix settings.py
Merge branch 'source'

Conflicts:
	fabfile.py
	settings.py
Let's see