Commit of all of Stuart's changes post launch
Merge pull request #2 from vivaandco/stuart-changes

Commit of all of Stuart's changes post launch