bumped slim version, fixed angular/slim conflict

Gemfile

@@ -1,5 +1,4 @@
 source :rubygems
 
-gem "middleman", "~>3.0.6"
-gem 'middleman-sprockets', :github => "middleman/middleman-sprockets"
-gem "slim"
+gem "middleman"
+gem "slim"

Gemfile.lock

@@ -1,114 +1,111 @@
-GIT
-  remote: git://github.com/middleman/middleman-sprockets.git
-  revision: 7950c5f356013240ee526b741a9b02bf0aea338b
-  specs:
-    middleman-sprockets (3.0.4)
-      middleman-more (>= 3.0.1)
-      sprockets (~> 2.1, < 2.5)
-      sprockets-sass (~> 0.8.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    chunky_png (1.2.6)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    chunky_png (1.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
-    compass (0.12.2)
+    coffee-script-source (1.7.1)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.2.0)
-    fssm (0.2.9)
-    haml (3.1.7)
-    hike (1.2.1)
-    http_router (0.10.2)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
-    i18n (0.6.1)
-    listen (0.5.3)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    middleman (3.0.6)
-      middleman-core (= 3.0.6)
-      middleman-more (= 3.0.6)
-      middleman-sprockets (~> 3.0.2)
-    middleman-core (3.0.6)
-      activesupport (~> 3.2.6)
-      bundler (~> 1.1)
-      listen (~> 0.5.2)
-      rack (~> 1.4.1)
-      rack-test (~> 0.6.1)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-      thor (~> 0.15.4)
-      tilt (~> 1.3.1)
-    middleman-more (3.0.6)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
+    erubis (2.7.0)
+    execjs (2.2.1)
+    ffi (1.9.3)
+    fssm (0.2.10)
+    haml (4.0.5)
+      tilt
+    hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
+    i18n (0.6.11)
+    json (1.8.1)
+    kramdown (1.4.0)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    middleman (3.3.3)
       coffee-script (~> 2.2.0)
-      coffee-script-source (~> 1.3.3)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
-      i18n (~> 0.6.0)
-      maruku (~> 0.6.0)
-      middleman-core (= 3.0.6)
-      padrino-helpers (= 0.10.7)
-      sass (>= 3.1.20)
-      uglifier (~> 1.2.6)
-    multi_json (1.4.0)
-    padrino-core (0.10.7)
-      activesupport (~> 3.2.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.15.2)
-      tilt (~> 1.3.0)
-    padrino-helpers (0.10.7)
-      i18n (~> 0.6)
-      padrino-core (= 0.10.7)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
+      compass (>= 0.12.4)
+      compass-import-once (= 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-core (= 3.3.3)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.3)
+      activesupport (~> 4.1.0)
+      bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (~> 1.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
+      thor (>= 0.15.2, < 2.0)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-sprockets (3.3.3)
+      middleman-core (>= 3.2)
+      sprockets (~> 2.2)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.1.0)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    padrino-helpers (0.12.2)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.2)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.2)
+      activesupport (>= 3.1)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.2)
-    rb-inotify (0.8.8)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.2.3)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.4)
-      temple (~> 0.5.5)
-      tilt (~> 1.3.3)
-    sprockets (2.4.5)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    sass (3.2.19)
+    slim (2.0.3)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (0.8.0)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.1.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    syntax (1.0.0)
-    temple (0.5.5)
-    thor (0.15.4)
-    tilt (1.3.3)
-    uglifier (1.2.7)
+    temple (0.6.8)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    uber (0.0.7)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    url_mount (0.2.1)
-      rack
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.0.6)
-  middleman-sprockets!
+  middleman
   slim

config.rb

@@ -54,6 +54,9 @@
 
 set :images_dir, 'images'
 
+# to play nicely with angularjs
+Slim::Engine.set_default_options :attr_delims => {'(' => ')', '[' => ']'}
+
 # Build-specific configuration
 configure :build do
   # For example, change the Compass output style for deployment
@@ -75,4 +78,4 @@
 
   # Or use a different image path
   # set :http_path, "/Content/images/"
-end
+end