Added VS2010 Compatibility
Fixed some merge issues
Merge pull request #15 from rdnelson/msvc10

Added Visual Studio solution.