Merge branch 'develop'
Merge branch 'master' into develop
updating dependencies and adding gemnasium and coveralls badges to readme