changed activesupport dependency to 4+ and upped version number
fixed conflicts
Merge pull request #3 from cavneb/master

changed activesupport dependency to 4+ and upped version number