Updated coin configs
merged latest nomp code
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed starting difficulty issues for proxy ports, including X11
Merge pull request #236 from bluecircle/master

Fix for x11 switch difficulty incorrect