Test more on Travis.
Less parantheses.
Merge branch 'master' into rails4
Rails 4 compatibility!
Fixes Gemfile.