update sufia to 4.2.0 in Gemfile so we have the latest experience
update README because we've switched our stack to include httpd and passenger
Merge branch 'master' into devise_confirmable

Conflicts:
	db/schema.rb
fixed 'Missing host to link to!' and renamed so that rake spec picks up test