Update badges
Merge pull request #1315 from Arcovion/v3-stable

Update badges
Update README.md
bump aruba dep
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
fix gemfile conflict