README cleanups

Remove version control merge leftovers, markdown fixes