Changed license to markdown.
Cleanup.
Revert changes for easy upstream rebase.