Updated to read from conf
Merge branch 'master' of git@github.com:furio/alfred-mpi.git

Conflicts:
	examples/configuration.properties