Minimal fixes for local testing
Fix tests
Merge pull request #115 from nephila/feature/fix_bootstrap

Fix bootstrap templates