basic threadsafe queue interface
Merge remote-tracking branch 'upstream/master' into threadsafequeue
Merge branch 'master' into threadsafequeue
added mergetool files to gitignore
added link dependency between WorldStorage and OSSupport
refactored chunk Queue to seperate class
Merge branch 'master' into threadsafequeue
clean up code for patching
fogot to add promise classes
Merge branch 'master' into threadsafequeue

Conflicts:
	src/OSSupport/Queue.h
rewrote queue not to use promises for waits
fixed a few remaining issues with worldstorage
added documentation
Merge branch 'master' into threadsafequeue
implement xsofts recommendations
fixed failure to return a value from Remove
actual fix
derp
Fixed Documentation
Add a Bitdeli badge to README