Revert "converting all multiline ifs to single line"

This reverts commit 32e8d2b06cfa25c6684ec459e05d804f304baa7d.
Revert "trying to get travis.yml to run without errors"

This reverts commit 91cd4cb28c001bcd7295b7b3d7eda0c82bbc4858.
Revert "moving travis.yml env vars to single line"

This reverts commit 2429d7b6662d506e190f46a5160aa9776e677364.
Revert "fixing .travis.yml"

This reverts commit e2124f0c42f2144466b0defc95a0547566364c12.