Began merging all the pull requests from the main Rolify repo.
Updating to include pull request #240
Bumping version up to 3.5.0 with the merges.
Merge pull request #263 from ZionsDirect/master

Merging in changes from my fork
Fixed travis-ci build URL

Since rolify moved to the RolifyCommunity organization, its repo URL has changed.
Fixing travis-ci build image URL

along with 9e7ae3c1d4, this change fixes the image URL of travis-ci build status
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/rolify/resource.rb