updated to 0.2.1

My rails 4 changes are in here as well, guess I'm lazy, but don't see a reason why you wouldn't accept those.