Updated some cache bugs and a little PSR-2'ing
Merge branch 'develop' of github.com:nailsapp/module-system into develop

Conflicts:
	system/models/user_model.php