Refactor Twitter module to reflect new Instagram pages
Merge remote-tracking branch 'origin/master' into twitter

Conflicts:
	app/views/layout.html
Turn on auth for Twitter pages
Merge pull request #2 from garethfoote/twitter

Refactor Twitter module to reflect new Instagram pages