Merge for splashpage rewrite

I am going to merge this into master, if I can do it automatically. Then I am going to branch master into SplashPage, and then into userAccounts. Splash Page will actually go up to do test analytic marketing, as well as add functionality.

I realize I am talking to myself but whatever.