Merge branch 'master' of https://github.com/hashbang/provisor
Merge branch 'master' into develop
Validate key on server by checking keytype for either ssh-rsa or
ssh-dsa.