Use the nickname reader everywhere
Use the master branches for all celluloid deps
Merge pull request #1 from halorgium/fixes

Some fixes for sanity