Added a bunch of stuff

too many things to list out...this is a poor pul request but whatever...it's a test account anyway, sucka.

![dealwithit](https://cloud.githubusercontent.com/assets/4661524/3709003/4c0d3a16-144d-11e4-9e3d-f7d265009caf.gif)