Settings revise

![screen shot 2014-03-14 at 3 45 43 pm](https://f.cloud.github.com/assets/108094/2425179/543b7bda-abb1-11e3-84c3-6b3472d9203b.png)

Todo:

- Transitions (maybe?)
- Merge with master