changed type signature for parse_type()
implemented parse_var_type()
Merge branch 'master' of https://github.com/johnprock/315