Fix conflicts in the parser and merge session type parsing back into
datatype parsing.
Merge branch 'sessions' of github.com:slindley/links into sessions