extra rails 4 stuff that should have been done & some slight cleanup
readme
Merge branch 'ruby2.1'