base layout in play, time to incorporate things back in
Things incorporated. Need to sync with changes in gh-pages
Sync with other changes