Bill Monk changes from 2011-2012

Each commit contains details notes.

The "nil" user to the left of each commit is because I made the commits on a machine that didn't have my git user name set up...