Merge pull request #7 from ehsteve/energy

Added ability to simulate energy
Merge pull request #8 from ehsteve/master

Pymilo's pull request fix. Adds hyperbolic and parabolic optics segments.
adding the option to select hyp. and par. geometry
Merge pull request #10 from pymilo/cone

Adding the option to select hyp. and par. geometry
merge from upstream