Updated Trinity version to r2013_08_14
updated tool conf to newest versions
Merge branch 'master' of github.com:ratschlab/oqtans_tools