update to script for use of ncsim
Merge branch 'master' of https://github.com/Jaxc/Sommar-2014