include local paths first to avoid building against installed headers
Merge branch 'devel' of github.com:LancePutnam/Gamma into devel