Merge pull request #131 from tribal-tec/master

Fix VS2012 build
Bump CMake subtree
Fix travis
Fix Boost 1.56 build