Fixing for yutaka
Merge branch 'master' of git://github.com/aramande/dotfiles

Conflicts:
	.bashrc
Update for awesome

updated to be compatible with 3.5