added travis badge
changed ci build
Merge pull request #3 from the-simian/ci

Ci