Gem updates
Clean up
Clean up and prep for addition of Contact model
Clean up and stylesheet merging