add waffle.io badge
Merge pull request #26 from waffle-iron/master

waffle.io Badge
integrate travis cli
adds travis badge
Merge branch 'master' into png_support

Catch up with master