Merge branch 'master' of https://github.com/syncretist/the-migrator into tw-views3

Conflicts:
	app/views/test-sessions/questions/admins_with_organization_access.erb
Removed crap about the footer partial
Added deep link from Org Access link
merges with Tristans work