make web-mode recognize .mak files as mako templates
prettify "yield" into γζ in javascript
make code highlighting in web-mode work again
more magit configuration

- Automatically set upstream
- Always show refined hunks
- Restore windows on quit
- Set default tracking branch name to remote branch name
org-startup-folded should now be t not 'content