Merge pull request #140 from raistlinthewiz/develop

Hopefully fixed travis build error.
Merge pull request #141 from raistlinthewiz/develop

Degraded tests project to .net4.0
Rename build/extra/tests/run-tests.sh to build/extra/run-tests.sh
Update .travis.yml