Another test to set up merge

Some more c++11 stuff, this time some functional things, and sweet
random distributions!