Merged in Stack's work on pysnip in this branch