gitconfig: set kaleidoscope as merge/diff tool
zshrc: removed rvm scripting line
ackrc: added haml as a filetype
alfred preferences: added prefs for workflows