Config edits, contact udpate.
Merge branch 'master' of https://github.com/gerakinis/gerakinis