Lots of cleanup
Merge https://github.com/racker/handy