badges
Merge branch 'master' of github.com:rthbound/foaas into aww_interfaces

* 'master' of github.com:rthbound/foaas:
  badges

Conflicts:
[RESOLVED]	README.md