fixed haml_tag so it doesn't explode with undefined method with_raw_haml_concat
Don't need the setup code
Merge pull request #1309 from Ortuna/haml-library

fixed haml_tag so it doesn't explode with undefined method with_raw_haml...
Merge remote-tracking branch 'upstream/master' into refresh-admin

* upstream/master:
  Don't need the setup code
  fixed haml_tag so it doesn't explode with undefined method with_raw_haml_concat
Update twitter bootstrap