docs other cleanup
0.5.0
Merge branch 'master' into active-record

* master:
  0.5.0
  docs other cleanup