IMHO
Revert some changes I'm not sold on yet.
Assume latest ruby.
Styling and editing.
Merge branch 'joshsusser-master'