add waffle.io badge
Put Waffle badge on the same line as build badge.
Merge branch 'waffle-iron-master'