cleaned whitespace
added error tracing
fixed indent in Makefile.am
Merge pull request #309 from mrshu/install-fix

Install fix
Merge branch 'master' into plugins

Conflicts:
	Makefile.am