Fixed some bugs in p-adics
Resolve conflict
Merge branch 'master' of https://github.com/Macaulay2/Workshop-2014-Berkeley