Fix Travis
Merge pull request #123 from eile/master

URI & PersistentMap improvements
Fix VS2012 build
Merge pull request #127 from tribal-tec/master

Fix VS2012 build
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