Adds missing `pluralize_noun`. Closes #1668.
Tweaks for GCC 4.4

Review 1039 by @mlucy
added samplers
whitespace
Merge branch 'next' into daniel_directory_efficiency