added short & long description columns to tours, updated seeds
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into Lienha

Conflicts:
	log/development.log
Merge pull request #66 from s-loar/Lienha

Lienhaadded short & long description columns to tours, updated seeds