Amulet test fixes: * Makefile: Only run precise-icehouse and trusty-icehouse tests by default and increase test timeout * t/00-setup: Simplify dependencies install * t/README: Mention charm-tools dependency * t/basic_deployment.py: - Specify unstable charm deployment - Let things settle with short sleep after deployment - Use dicts in add_services - Rename restart test - Cleanup on test failure