Makefile: Updated to latest gluon master
site.conf: Add vim modeline
Merge branch 'master' into experimental