Merging the use of num_cores in settings.yaml

Ticket #130  describes the changes I've made in this branch. I believe it's ready to be merged into `master`.