update nunicode version to 1.5.1
untabify
More complete uv::thread
Adhere to naming conventions
Texturepool ⇢ TexturePool (fixes #655)
Remove unnecessary cast
Use TESTMUNK in travis to start Testmunk
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
Fix names in Map
Remove accidental friend
Remove old TODO
Fix accidentally commented code
Fix set -e
Restore travis timing
Use std::lock_guard
add array overloads to make_unique and move it to mbgl::util from std
Use uv::async and various other fixes
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/map/map.cpp
Fix make_unique
Remove old TODO