added badges
Merge branch 'master' into v2.1
Added / Updated some docblocks.