adding prettydate
Merge branch 'master' of github.com:alexcoleman/backcountry

Conflicts:
	templates/includes/activity.html