Update shortest path programs.
Move some options from conf.hpp to conf.mk
Merge branch 'master' of github.com:flavioc/meld

Conflicts:
	Makefile
	conf.hpp