Add .rc files
Update bundle files
Add emacs23 files
Merge branch 'feature_tmp'

Conflicts:
	.vim/.netrwhist