indenting mostly, but also keeping better track of free memory for multiscan
Merge branch '2.1' of https://github.com/cudpp/cudpp into 2.1