Changed Config stuff to remove some of the redundant ifo
Merge https://github.com/JimmyCollett/derp-octo-adventure