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

... from feature/tracks_activation
Would it be better for validation and form input purposes to make this a URLField as opposed to just a CharField?