Add flexpath test
Modify for flexpath
Formalize Makefile and modify staging.cpp
Merge branch 'master' into FIT
Modify environments