fixing some things on the activity form
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	source/views/activities.slim
tidying up some things on the activity form