Add updated test setup using py.test
Partial revamp of config system for astropy > 0.4 compatibility
Documentation updates, and update contributors list
Merge branch 'master' of github.com:mperrin/poppy

Merge conflict fix
bump version number to 0.3; update release date