Forgot what I did. :) Pushing so I can work on the train.
Merge branch 'master' of github.com:wridgers/john