new versioning style, removed travis-ci stuff
Merge branch 'master' of https://github.com/jothousand/surf