fix defaults for @author in php-doc
add showmarks plugin
add sqlcomplete plugin
colors and stuff
Merge branch 'master' of http://github.com/rmspatches/dotvim
remove files/folders that shouldn't be tracked after all; local files
set bash as default shell
add .gitignore
Merge branch 'master' of http://github.com/rmspatches/dotvim

Conflicts:
	doc/tags
	vimrc
fix merge error ...
updates
add gundo toggle (f6)
update
Merge branch 'master' of http://github.com/rmspatches/dotvim
add vim Todo macro
cleanup
Merge branch 'master' of http://github.com/rmspatches/dotvim

Conflicts:
	vimrc