My Ubuntu 12.04 gcc 4.6.3 machine did not like -std=c++11 so I moved it to the individual OS files.  It's done here the same way so that it doesn't merge conflict with my Linux fixes below.