fix refactor breakage...

... including namespace conflict fixes with rails-3.x
Merge branch 'hotfix/refactor_b0rkage_fix' into next
version bump
Merge branch 'release/v0.2.13' into next