Merge pull request #7 from martinghunt/master

Add blast program version and type to output directory name
Ask for 2 threads in final combine job