initial commit of new install
Merge branch 'master' of github.com:alemedeiros/dotfiles

Conflicts:
	.aliases
	.bashrc
	.config/awesome/rc.lua
	.config/awesome/theme/orion.lua
	.ssh/config
	.vim/.netrwhist
	.vim/doc/NERD_tree.txt
	.vim/doc/bufexplorer.txt
	.vim/nerdtree_plugin/exec_menuitem.vim
	.vim/nerdtree_plugin/fs_menu.vim
	.vim/plugin/NERD_tree.vim
	.vim/plugin/bufexplorer.vim
	.vim/syntax/armasm.vim
	.vim/syntax/nerdtree.vim
	.vimrc
	.xinitrc