core: addressing issue #529. Using vector<int> instead of vector<unsigned int> for affinity mask vector.

This is wrong as the mask should be unsigned, but necessary for SWIG to work cleanly on both 32-bit and 64-bit platforms.
Merge branch 'master' into next

Conflicts:
	gnuradio-runtime/include/gr_block.h
core: addressing issue #529. Using vector<int> instead of vector<unsigned int> for affinity mask vector.

This is wrong as the mask should be unsigned, but necessary for SWIG to work cleanly on both 32-bit and 64-bit platforms.
uhd: include directory naming bug fixed.
Merge branch 'maint'
Merge branch 'master' into next