Cleanup and bump to 2.0 alpha

![nyan_data](https://cloud.githubusercontent.com/assets/146040/3257493/cdb22628-f22c-11e3-880e-7fa3e8cc7cc9.gif)