reduce timeout for nc port tests
Merge pull request #142 from aheissenberger/fix/pull/port-detect-timeout

reduce timeout for nc port tests
Make sure we forward all the arguments to ssh
Put /tmp on the hard drive, if we have one. Fixes #125
Better /tmp handling. Refs #125
Indentation should be 4 spaces. No tabs.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot2docker