Merge pull request #1 from timlinux/master

Fixes so that mapproxy runs on a port rather than a socket and users per...
Merge remote-tracking branch 'upstream/master'
Added better readme notes