Merge branch 'master' of https://github.com/Macaulay2/Workshop-2014-Berkeley

Conflicts:
	MumfordCurves/pAdic.m2
Resolve conflict