Moved some files that shouldn't always want to be copied over.
Merge branch 'master' of https://github.com/bjaiyen/config