changing to plotting nonzero wavefront phase array in else: case
settings
added axis labels and tight_layout() call
added error handling of trying to run plt.tight_layout()
Merge branch 'master' of https://github.com/mperrin/poppy

Conflicts:
	.gitignore
	poppy/poppy.cfg
	poppy/settings.py
Delete .#utils.py
catching up with upstream, v.0.3.3.dev
merge with latest upstream version
added resampling of the optic in getPhasor, using scipy.ndimage.interpolation.zoom
removed poppy/settings.py to be consistant with upstream
updated .gitignore to be consistant with upstream
updating module to import AnalyticOpticalElement from
removing tight_layout call

users can call plt.tight_layout() after wavefront.display(…) is run.
added test of rescaling in getPhasor()
changed resizing spline order to 3
rewording function desciption
added interp_order keyword and attribute to OpticalElement, defines order of spline used in zooming
Merge pull request #10 from douglase/master

add rescale/resample of FITSOpticalElements for wavefronts at a different pixel scale. Contributed by @douglase, thanks much.