Upate assets to play nicely with https
Enable force_ssl in production
replace DEFAULT_URL_HOST with CANONICAL_HOST
Merge branch 'master' of github.com:askaway/askaway into feature/pretty-pictures

Conflicts:
	app/views/users/edit.html.haml
	app/views/users/show.html.haml
Fix failing spec