moved a file in preparation for auto-rebasing #4 onto #1
fix Rails autoload issue, version bump
Merge pull request #5 from betesh/autoload

Merges #4 onto #1