Makefile hacking. Go over tests. elisp-comp got borked again.
Makefile hacking.
Merge branch 'master' of github.com:rocky/emacs-loc-changes

Conflicts:
	Makefile.am
	test/Makefile
	test/Makefile.am
	test/test-basic.el
Makefile.am got borked in merge.
Remove more shmutz