add somewhat hackish ftjerm configs
Merge branch 'master' of https://github.com/shmibs/aweseom-MATE-config

Conflicts:
	.ftjerm