almost done, bug in reconstruct for simulated LoS
fixed conflicts
fixed last few conflicts. code is ready to go
Merge branch 'master' of github.com:drphilmarshall/Pangloss