Add ability to build against both gtk2 and gtk3

Also clean up some of the build system
This removes two seperate includedir's for gtk2 and gtk3