Merge pull request #69 from svermeulen/bufferLocalChange

Added ability to customize port and also made buffer-local options for host
Merge remote-tracking branch 'nosami/master' into working