Added VNC/RDP to parser
More parser changes
Driver Fixes + Parser

Commented out amap code. Fixed selenium driver creation to use
cli_parsed. Added plaintext parsing. Added timeout to driver
Merge pull request #99 from ChrisTruncer/ParserUpdate

Parser update