Adds apktool to jsa
Remove caches
Merge branch 'master' of https://github.com/devboy/our-boxen

Conflicts:
	Gemfile.lock
	modules/people/manifests/devboy.pp