Change parallel for to use auto granularity
Merge branch 'master' of github.com:hpce2014/hpce_cw5

Conflicts:
	src/process_opt.cpp