removed duplicate file
more intelligent use of cores
Merge branch 'dev' of https://github.com/PaulHancock/Aegean into dev