Fixes OpenZeppelin/zeppelin-solidity#434
- Upgrade version - Re-enable in travis.yml - Move mocks to contracts folder for instrumentation