merging
Merge branch 'master' of https://github.com/hboylan/peaknode

Conflicts:
	config/connect.js