Merge pull request #1 from patrick-wright/master

add basic keypair task
Merge remote-tracking branch 'upstream/master'