Renamed url to base_url
Merge pull request #256 from bkimble/rename_url_to_base_url

Renamed url to base_url

Conflicts:
	spec/support/boot.rb