Add line and column info to the Token structure

This will allow us to throw error messages that point to a line and
column later. Woot!