JMA - Changes to get c++ 11 working locally
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5

Conflicts:
	node_test.cpp
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge remote-tracking branch 'origin/feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5

Conflicts:
	Makefile
Merge branch 'feature/SASHIMI-370' into feature/extend-support-subweave-local-osx-10.8.5
JMA - added DEBUG 1 for local debugging
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge conflict resolved
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5
JMA - removed extra logging in LcsCollectionComparator
JMA - moved DEBUG to makefile rather than inline
Merge branch 'feature/extend-support-subweave' into feature/extend-support-subweave-local-osx-10.8.5