fixed some comments
Merge branch 'master' of github.com:svanschooten/genesis
removed some console.logs, mostly fixed custom gates
fixed merge conflicts