fix to syntax issues and drupal filetype
Merge resolved
Merge branch 'linux' of github.com:gkallenberg/dotvim

Conflicts:
	vimrc
add Tim Pope's unimpaired bundle