Fixed vs2012 compile errors in previous commit

Problems with tests in this commit..
Ran vs tests
Merge pull request #35 from TotteKarlsson/add_abort_to_plugins

Fixed build for VS