autoupdate submodules
better ssh config
merged with master
fix ssh sillyness
Merge branch 'master' into mac
merged