Reverted most of the stuff in b0045eb6aebe8d44bf6918b763044c4cc0416ec0
Merge branch '0.2.x' of github.com:pieterb/Rackful into 0.2.x