Merge remote-tracking branch 'origin/master'

.DS_Store

.gitignore

demos/Pyramid Notebook Example.ipynb

demos/files/magdata.hdf5

demos/files/phase.unf

demos/files/phasemap.hdf5

demos/images/activate.png

demos/images/addsource.png

demos/images/environment.png

demos/images/jutil-gitlab.png

demos/images/phasemap-attributes.png

demos/images/plot-field-params.png

demos/images/plot-holo-params.png

demos/images/plot-phase-params.png

demos/images/plot-quiver-params.png

demos/images/pm-params.png

demos/images/pyramid-gitlab.png

demos/images/rec2d-params.png

demos/images/vectordata-attributes.png

pyramid/.DS_Store