Pull latest ready-to-go functionality into master for 1.4.0
Fix typo
Tidy event_rocket references (change them to eventrocket)
Merge branch 'master' into develop
Initial work on embed events shortcode