fixed build on windows using vs2012
cmake cleanup
wording change on comment
use unifier from vendor location