ignore 'll' command in history
stop harassing me with changes to purple prefs
changed vim modeline filetype to tmux
Merge remote-tracking branch 'origin/master'