Modified some functional and integration test to ensure they only run when the "integration" test flag has been set. Thus Oxalis should compile out-of-the-box.
Merge remote-tracking branch 'origin/master'