Cleanup in Makefile.am's and configure.ac

Indent style
Change deprecated INCLUDES to AM_CPPFLAGS