Added some of Jeff's stuff in
Merge branch 'master' of github.com:bcaffo/modules

different files on laptop and tower