Added rake to Gemfile for Travis
Merge branch 'master' into version-0.5