Merge pull request #12 from alab0329/master

merge
fixed rdf, reduced header dependencies, cigar-npt compiling
more moved to header only.
Merge pull request #3 from mlund/master

merge w. bjorn