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