Cleanup
More cleanup
Upgrade to Celluloid 0.14.1