Fixed some tests and added nokogiri to the gemfile
Merge branch 'master' into test
added database cleaner
removed 'require faker' from factories.rb
fixed random text in factories.rb