Merge pull request #70 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #72 from Venture-TheSphinxTeam/dev

Dev
Merge branch 'master' of https://github.com/ShadowSam/Sphinx
Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/master'
Updating config file to point at dev
Merge pull request #77 from ShadowSam/master

Fixing config file