straightened out some imports vs depends issues
Merge branch 'master' into npRmpi

Conflicts:
	DESCRIPTION
	NAMESPACE