Added a new alias to bashrc, updated gitignore
Merge branch 'master' of ssh://bravo/~/conf.d