add waffle.io badge
ssh user option removed in favor of using ssh config
Merge pull request #9 from waffle-iron/master

waffle.io Badge
Merge remote-tracking branch 'ern/master' into vagrant