modified path information
Merge https://github.com/Macaulay2/Workshop-2014-Berkeley

Conflicts:
	NCAlgebra/NCAlgebra.m2
Merge https://github.com/Macaulay2/Workshop-2014-Berkeley