updated port logic to allow config to inject no port
0.2.4
updated port logic again.  this should be correct now
0.2.5
added timeout
0.2.6
Merge commit '7f3ef017683974b7079cafcc739b3923e79d2fe5' into 0.2

Conflicts:
	package.json