Added EC2 command line tool support
Re-add syntax highlighting support