Replace gemspec dependency on Rails with Railties
Merge master and resolve conflicts
Merge pull request #2 from code-mancers/depend-on-railties

Replace gem dependency on Rails with Railties