Cleanup build
Merge pull request #18 from fluxroot/FLUX-15

Cleanup build

FLUX-15 #build