Set defaults for tweets without location or images
Removed twitter option from menu temporarily
Renabled auth
Merge remote-tracking branch 'origin/master' into twitter

Conflicts:
	app/views/layout.html
Turn on auth for Twitter pages