Merge pull request #13 from samdoshi/dev

travis-ci and rust-ci tweaks