updates to be discarded
more discards
Merge branch 'master' of /Users/rbrown/Dropbox/git/pyMinc

Conflicts:
	build/lib.macosx-10.7-intel-2.7/pyMinc.so
	build/lib.macosx-10.7-intel-2.7/pyMinctracc.so
	build/temp.macosx-10.7-intel-2.7/pyMinc.o
	build/temp.macosx-10.7-intel-2.7/pyMinctracc/pyMinctracc.o
	pyMinc.c
	pyMinc.pyx
	pyMinctracc/pyMinctracc.c
	pyMinctracc/pyMinctracc.pyx
Nonlinear support