Fix to mailed out PT string
Adds in the spec file
Builds out the factories significantly on the email and trip side. In service of building out the tests.  They're not all the way there yet, but way closer.
typo
Moving SMTP creds into branding file and out of application.yml
Upgrade to Rails 4 [Fixes #63623362]
updating/installing gems for Rails 4.  Stupid windows box.
Merge branch 'develop' of github.com:camsys/oneclick into develop

Conflicts:
	Gemfile.lock