sh: Add aliases for apt
vim: Remove all plugins
vim: Add vundle
vim: Add back most important plugins
git: Include merge base content in conflict markers
colors: Try using solarized color scheme everywhere
awesome: Add keyboard layout switcher
sh: Add aliases for switching keyboard layouts