rails update closes #36
Merge pull request #45 from ibawt/bump_rails

rails update closes #36