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
Coninuing merge
Merged in d37e150
Use bootstrap/ prefix in @import statements instead of ./ relative paths.
Updating ignore file
Integrating November updates
Improved script to do all necessary actions for upgrade.

Now automatically takes care of path changes for the includes in bootstrap.scss and responsive.scss (From #258)
Merging in further updates
Caught up with upstream