Merge pull request #94 from bruttenberg/DEV2.1

BP Merge
Remove Expand from import
Require clean before compile
Merge pull request #100 from gtakata/DEV2.1

Dev2.1
Merge pull request #2 from p2t2/DEV2.1

Dev2.1
Query-directed LFI
Merge branch 'DEV2.1' of https://github.com/apfeffer/figaro into DEV2.1
Lazy factored inference optimizations
Merge pull request #104 from apfeffer/DEV2.1

Lazy factored inference optimizations
Fixes to BP