Removed some code to make this easier to setup on github as a public repo
Merge branch some private config info