Updated defaults in demos, version number bumped to 0.60-0,
updated np_faq.Rnw, freezing features for pending release
fixed regression in regression regarding adaptive/generalized nearest neighbors
further fixes
Merge branch 'master' of https://github.com/JeffreyRacine/R-Package-np
Merge branch 'master' into npRmpi

Conflicts:
	DESCRIPTION
	R/zzz.R
adding a git attributes file to prefer original files over merged ones
for description and zzz.R
Merge branch 'npRmpi' of https://github.com/JeffreyRacine/R-Package-np into npRmpi

Conflicts:
	CHANGELOG