More c++11 goodies (lambdas)
Fix config.cpp for tests
Less verbose sm