Update usage of PortForwardManager
Change deprecated code usage
Fix waiting for reboot

- previously might poll over ssh before reboot had happened, and 
  wrongly concluded it had finished!
Merge pull request #72 from aledsage/fix/various-20141127

Fix/various 20141127