First pass at Rails 3.2.13 update
Update Gems, including Haml
Set default javascripts
Update form_for use for Rails 3
Fix indents in views
Change compute_public_path to asset_path?
asset_path workaround hack
Batch replace "- form_for" with "= form_for"
Merge branch 'rails-3.1.12' into rails-3.2.13

Conflicts:
	Gemfile.lock
Add magic encoding for jruby-1.7.4
Unlock factory_girl
Factory->FactoryGirl
Set utf-8 encoding
FactoryGirl.next->FactoryGirl.generate
FactoryGirl(:symbol)->FactoryGirl.create(:symbol)
Change in Grit::Index#commit arguments
Remove accidentally committed .rails2 backup file
Schema update
Incredibly hacky first pass at JGit use
Add jars