Merge remote-tracking branch 'juniper/master'
enhancements for fix#256
comment fixes
Merge pull request #261 from jeremyschulman/master

fix #260 - support ssh key files