Added slim template gem
Merge with master changes