blocks: added includes necessary for Windows compilation
prefs: pass strings by reference. Also cleans up a comma in gr_modtool that made a string into a tuple (and C++ angry).
Merge branch 'master' into next

Conflicts:
	gnuradio-core/src/lib/general/gr_prefs.cc