Merge branch 'master' into stable

Merge in travis build config change
add dependency and coverage badges
Merge branch 'stable'

Coverage and dependency badges