Merge pull request #8 from cfachicago/development

Merging Development into the Master Branch
Merge pull request #10 from cfachicago/development

Merging Development into the Master Branch to include patch
Adding a working cap deploy file.
changing the deployment user to 'adopt'
Merge branch 'development' of github.com:cfachicago/adopt-a-sidewalk into adding_capistrano

Conflicts:
	Gemfile.lock
rm deprecated devise option that was causing build issues
Merge branch 'master' of github.com:cfachicago/adopt-a-sidewalk into adding_capistrano
fixing refs to repos
Merge pull request #15 from cgansen/adding_capistrano

Adding a capistrano config for deployment