user service stubby layout + test
remove dropin.cache
Merge

Merge branch 'develop' of github.com:praekelt/archer into feature/comments-2

Conflicts:
	setup.py