rich text editor for active admin
rich config for events
Merge branch 'master' of github-as-matt:mhmaguire/westlake into rich
merged conflicts
prep for pull
prep for pull
fixed conflicts