Merge pull request #51 from bwsw/content-fixes

Content fixes - merged to a remote master and built, Looks OK.  Probably needs some heading sizes tweaked, but getting content accurate more important.