Fix Travis
Fix VS2012 build
Merge pull request #127 from tribal-tec/master

Fix VS2012 build
PersistentMap fixes and test improvements
Logging improvements
Merge branch 'master' of https://github.com/eile/Lunchbox

Conflicts:
	tests/persistentMap.cpp
Merge branch 'master' of https://github.com/eile/Lunchbox

Conflicts:
	tests/persistentMap.cpp
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Fix some issues reported by clang-check
PersistentMap: be less strict about value types
Merge branch 'master' of https://github.com/eile/Lunchbox
Fix Travis
Merge pull request #128 from eile/master

PersistentMap fixes and test improvements
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitexternals