bugfix
added stuff to ignore logs/cache
Merge branch 'master' of https://github.com/waterfoul/Incursus-Labs

Conflicts:
	apiSync/syncPermissions.php