tips cleaned up a bit
Merge branch 'tutorial'

Conflicts:
	VicBikeMap/settings/dev.py
merged tutorial, fixed errors in merge