*demo makefiles: added -rpath linker options.
* update .gitignore.
Merge branch 'master' into ubuntu

Conflicts:
	.gitignore