update for Vim 7.4
fix to supporting both Python 2.7 and 3.3
Merge branch 'support-vim74'