Merge pull request #69 from MITx/update_dependencies

Update requirement dependencies

.gitignore

@@ -18,4 +18,5 @@ coverage.xml
 cover/
 log/
 reports/
-\#*\#
\ No newline at end of file
+/src/
+\#*\#

Gemfile

 source :rubygems
 
-gem 'rake', '0.8.3'
+gem 'rake'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     bourbon (1.3.6)
       sass (>= 3.1)
-    rake (0.8.3)
+    rake (0.9.2.2)
     sass (3.1.15)
 
 PLATFORMS
@@ -11,5 +11,5 @@ PLATFORMS
 
 DEPENDENCIES
   bourbon (~> 1.3.6)
-  rake (= 0.8.3)
+  rake
   sass (= 3.1.15)

requirements.txt

@@ -13,7 +13,7 @@ python-memcached
 django-celery
 path.py
 django_debug_toolbar
-django-pipeline
+-e git://github.com/MITx/django-pipeline.git@incremental_compile#egg=django-pipeline
 django-staticfiles>=1.2.1
 django-masquerade
 fs