config changed to localhost 17th June
Merge branch 'master' of https://github.com/drbswrb/alpha