Add Tabline (Thanks, @augustohp)
Add Tabline (Thanks, @augustohp)
Merge branch 'master' of git://github.com/nelsonsar/sweethome

Conflicts:
	.gitmodules
Merge branch 'master' of git://github.com/nelsonsar/sweethome

Conflicts:
	.gitmodules
Merge branch 'master' of git://github.com/nelsonsar/sweethome
Adding some vim maps