Merge pull request #11 from rpeterman-gp/local-rpeterman-gp

Fixed styling issue with welcome page
Merge pull request #12 from rpeterman-gp/master

Attempt to get files in sysnc.
Added cache busting to welcome page css & js
Merge pull request #13 from rpeterman-gp/local-rpeterman-gp

Added cache busting to welcome page css & js
Update page-welcome.tpl.php

chaged & to ?
Fix some ad timing issues
Merge pull request #2 from gstout-gp/master

small update & to ? in cache bust