Fix bugs
Come on Travis, try again
Switch to using MapChunkBulk
Merge remote-tracking branch 'origin/master'