Pulling changes off of the air.  Havn't touched this in a bit, so I'm not sure what's there.
Merge branch 'master' of https://github.com/mark/bloxley-rb