Refactor

This PR organizes the various config files somewhat. The idea is essentially that `.fork` takes precedence over the standard files and `.local` should take precedence over all.

![config-dependencies](https://f.cloud.github.com/assets/108972/1646775/7801d67c-5927-11e3-901d-d98e77cd5341.png)

This shouldn't change anything significant for the end user.