Resync requirements with macbook
Now that wordspeak.org isn't on textdrive, allow for deployment without ssh if we're on the actual machine that hosts.
Merge remote-tracking branch 'origin/master'