Merge pull request #20 from infirit/master

Fix for the missing schema issue 19
automake fixes: INCLUDES -> AM_CPPFLAGS
Merge pull request #22 from infirit/automake-fixes

automake fixes: INCLUDES -> AM_CPPFLAGS