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

Moving config stuff around 2