Removed remainder from merge conflict
Rewrote README in Markdown style
Re-indenting some content for better rendering on Github
Pulling in master changes