forward SSH port, as it isn't by default on Windows
Merge pull request #95 from joefitzgerald/develop

1.21 Release - Develop Merge into Master
Merge branch 'forward-ssh-port' into develop
Update CHANGELOG.md
Merge branch 'master' into develop