Fix switching between local and remote
Merge branch 'master' of github.com:nyddle/pystash