Work on upgrade [ci skip]
More fixes [ci skip]
cleanup and add failing spec
Memoize typecast clone
Merge remote-tracking branch 'origin/master' into rails4
Merge remote-tracking branch 'origin/audio-refactor' into rails4
[ci skip]

Conflicts:
	app/models/audio.rb
	db/schema.rb
	spec/models/audio_spec.rb
Add some ignore paths to Guardfile
Get all tests passing
Fix load order for test classes and factories
Bundle update
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	db/schema.rb
Update gem dependencies
Asset fallback in development; Remove some unnecessary config
Deploy to staging; Use cache in staging
Fix branch
Remove thinking sphinx capistrano tasks
Cleanup environment files
Remove reference to thinking sphinx cap tasks in staging.rb
Remove bin/ directory
Remove unnecessary config option