Mac Updates

Functions and switch added.
Merge branch 'master' of https://github.com/t-faoro/Tylor

Conflicts:
	config.php