Changes update; code formatting
remove deleted test data from MANIFEST
Merge branch 'devel' of github.com:wtsi-npg/npg_tracking into devel2

Conflicts:
	Changes