Merge pull request #24 from jdgleaver/load-content-fix

Fix content loading
24 jobs for master in 9 minutes and 46 seconds (queued for 11 minutes and 45 seconds)