Don't download nr automatically for now
commited by: Kevin (kmdalton@stanford.edu)
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   setup.py --commented out downloadNR for now
	modified:   water.py --changed the directory prefix finder to match pinfwrapper