Merge branch 'dev'
Move tests around to match the directory structure of Rails 4 tests (fix #161)
Merge branch 'master' into dev