Last commit before 1.0.0 release.

Tidy up and added shortcodes
Merge branch 'master' of github.com:spacedmonkey/super-simple-events

Conflicts:
	admin/class-super-simple-events-admin.php