Always convert line endings
Make git ff do fast forward only
Revert "Always convert line endings"

This reverts commit 2efcff3c39a636aa4fb2fdaf1e409554754ccad9.
Mess around with tmux config
Change default browser to firefox
Merge branch 'master' into chewbacca