Merge in rphillips updates from https://github.com/racker/virgo/pull/384