Updated site.conf / site.mk to 2014.3.1 format
Merge branch 'master' of github.com:ffrl/sites-ffrl