made includes work more nicely with OSX
made -std=c++11 a linux specific option because OSX is too stupid to support the -std flag apparently
fixed a small typo that would make it not work on OSX