git -- dropped default merge strategy as simple

On bagheera there is git 1.7.9.5 and it donesn't support that.
Merge branch 'master' of github.com:dvarrazzo/dotfiles
vim -- enought with flashes
vim -- detect .md as markdown
awesome -- added skype to the menu
mozilla -- search on https
awesome -- open the gnome mixer
awesome -- system menu customized

Conflicts:

	awesome/rc.lua
xsession -- added bagheera config
xsession -- try to do without the gnome session on bagheera
xsession -- Notify if an applet fails to start