Some stuff. Wish I hadn't lost the FL changes
Merge branch 'master' of github.com:wryun/config

Conflicts:
	esrc
	profile