Merge branch 'master' into 'master'

pyramid.egg-info/PKG-INFO

pyramid.egg-info/SOURCES.txt

pyramid.egg-info/dependency_links.txt

pyramid.egg-info/top_level.txt

pyramid/__pycache__/__init__.cpython-35.pyc

pyramid/__pycache__/analytic.cpython-35.pyc

pyramid/__pycache__/colors.cpython-35.pyc

pyramid/__pycache__/fieldconverter.cpython-35.pyc

pyramid/__pycache__/fielddata.cpython-35.pyc

pyramid/__pycache__/phasemap.cpython-35.pyc

pyramid/__pycache__/plottools.cpython-35.pyc

pyramid/__pycache__/reconstruction.cpython-35.pyc

pyramid/phasemapper.py

pyramid/tests/test_phasemapper.py

pyramid/tests/test_phasemapper/Charge_phase_ref.hdf5

pyramid/tests/test_phasemapper/Charge_proj.hdf5

pyramid/version.py