Merge pull request #175 from hazendaz/master

Thinking Visual Studio 2013
Merge pull request #178 from hazendaz/master

Updating dependencies and bringing jmockit to the party