first pass at asset pipeline
Merge branch 'rails_3.2' into asset_pipeline

Conflicts:
	public/stylesheets/application.css
asset pipeline fixes for running in production environment
switch to using image-url instead of url in sass
Merge branch 'asset_pipeline' into upgrades

Conflicts:
	Gemfile
	Gemfile.lock