Revert "fix some issues with pushstate"

This reverts commit 93f17e27b4ecff77446caccdde9da729ebcc8f66.
Revert "Revert "fix some issues with pushstate""

This reverts commit 4d8ce60f58a191df0b110bacf6bb02d4c73523f3.
Merge branch 'master' of github.com:Automattic/sulfur