Shuffling some dependencies around.
Merge pull request #107 from Nabellaleen/master

Looks good; I'm merging it in. Thanks for the contribution!
Merge remote-tracking branch 'origin/master' into VisualCpp2012