Upgrade to rails 4.0
Fix some more Rails 4 issues
Merge branch 'master' into rails-4
Merge branch 'master' into rails-4

Conflicts:
	Gemfile.lock
	app/models/post.rb
Merge pull request #50 from mutle/rails-4

Rails 4 upgrade