Version 2.1.1
Starting merge in of newer changes
Updating ignore file
Updated JS to newest status
Continuing integration of upstream updates
Further updates and upgrades
Progressed to variables
Finished merging in 776583f
Bump version of bootstrap
Resolved merge conflict
Cleanup botched merge
Update sass-rails dependency version to require > 3.2
Update test to adhere to sass 3.2 dependency
Added sass_3_2 gem assertion
Ah, finally got the travis config. Updated for gem version bump.
Continuing merge of upstream updates
Fix module to correctly include compass extenstion.

Sorry about all the commits - still getting my bearings with compass.
Bah, don't need the submodule anymore.
Continuing merge in of 1112 changes
Merge in 331b98a