Merge branch 'dev' into multi_input
Stupid fits format pads strings with spaces, messing up objtype.  Strip whitespace.
Add --sky option; fix units in sky template
Merge branch 'multi_input' into dev to get --sky option
update doc about new xy vs w format