adding contributions from content sprint
Merge branch 'master' of https://github.com/rsoden/epic