v0.016

	Modified Targeted Trap code to not include Critical and LoxP regions when they aren't present.
Merge branch 'master' into devel
Merge branch 'devel' into andrew_deletions