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

Moving config stuff around 3