Merge pull request #14 from RLReed/dev

Pull into dev with UserBasis, etc.
Final fixes from basis merge
Merge branch 'dev' of http://github.com/RLReed/libdetran into dev

Conflicts:
	src/solvers/mg/CMFDLossOperator.cc
	src/utilities/MathUtilities.hh