Moving config stuff around
Merge pull request #5 from carringtonsean/Chris-Development

Moving config stuff around