Update highlight
Updating to master
Added check for blank line before cffunction
Fixing conflicts