added shortcuts for vimdiff.  ,dp now puts selected parts of the working copy into the buffer
Now can switch betweeen windows and splits by using Ctrl + h,j,k,l
Added shortcuts for inserting ruby ERB tags