Merge pull request #5 from inaka/jfacorro.support.token.attrs.as.prop.lists

Support token attributes as proplists
Merge pull request #4 from inaka/master

Map terminals
Merge remote-tracking branch 'upstream/master'