Milestone 3 Compliance (minus error messages)

Fixed string handling in scanner (and updated parser to match) to not
include ' ' as part of the lexeme

Will discuss errors in email