merging in daniel's routes cleanup
Remove hanging spaces at end of lines and clean up formating
Improve organization index view code formatting.

Conflicts:
	app/views/organizations/index.html.erb
Merge pull request #157 from marianmosley/make_address

Allow charity address and telephone to be made public
refactoring cuke to use scenario outline, doing so for privacy scenarios is exercise for Marian
adding to travis to automate running db:migrate
Merge branch 'develop' into cherrypicking_daniel
merging recent changes to routes file with daniels cleanup
add examples for marking email public/ private