Fix test suite
Merge pull request #37 from LaunchAcademy/fix_travis_tests

Fix travis tests
Merge branch 'master' of github.com:LaunchAcademy/meta_review into layouts_page

Conflicts:
	app/views/sites/show.html.erb
most recent updates