Ports changes to models and model tests along with some settings changes...

... from feature/tracks_activation
Changed to a URLField.  The field is currently required.