Revert "Revert "Merge branch 'new_human_assembly' into david_misc""

This reverts commit 818a9904202e71fb254c074d0dc551683ebe6b07.

Conflicts:

	Changes