Merge pull request #5 from emersonveenstra/readme-icons

Fixed the readme buttons
Merge pull request #6 from emersonveenstra/travis-fixes

Added new variables to .travis.yml
Merge remote-tracking branch 'upstream/master' into travis-fixes
Added variables