Ridied up some loose ends
Merge branch 'testing' of github.com:PMaynard/port22 into testing
Merged Testing