use vimdiff as sometimes we dont have X available
Merge branch 'master' of git://github.com/jakebolewski/JuliaParser.jl
allow parsing of end, elseif, etc. reserved words as symbols