Removed wildfire and redundant setting.
Merge branch 'master' of https://github.com/MattWoelk/dotfiles