Added first cut at capistrano deployment support.
Merge branch 'edwards'

Conflicts:
	Gemfile