Completed markdown support and cucumber testing and ready to merge back into develop