Updated travis build image to master (it was dev-master, which is out of date)
Merge pull request #286 from oxtopus/travis_img

correct travis build status image
Merge branch 'master' into grokengine