Add conflicts with stuff
Added pubkey authentication
Merge branch 'develop' of github.com:syncany/syncany-plugin-sftp into develop
Merge branch 'develop' of github.com:cr0/syncany-plugin-sftp into develop