Fixed conflict between std::move and boost::move

Used a boost macro to resolve the issue, which only seems to be an issue
on VS 2010