PLD: combine odk_viewer into other parallel test
PLD: parallel main and others
Merge pull request #92 from onaio/travis-tweak

PLD: combine odk_viewer into other parallel test