Minor changes for setup.py
Merge branch 'master' of github.com:rth/hedp

Conflicts:
	hedp/pp/lflash.py
	hedp/pp/shadowgraphy.py
Fix merge conflict