Move the parsing code into parse_content() where it should be
Move the parsing code into parse_content() where it should be

wcmitchell/insights-core,PaulWay/insights-core,PaulWay/insights-core,wcmitchell/insights-core