Add include/lib dirs for Boxen as well
Merge branch 'master' into follow-clang-ast

Conflicts:
	documentalist.cabal
Add matching for categories and class methods

This allows us to finally stop recursing into declarations.