Merge pull request #20 from KevWright/master

Fixed conflicts, added proper markup for code blocks + lexer info, and merged some synopsis and notes
Made content in metadata of markdown files more human friendly (e.g. replaced some hyphens with spaces, removed _005 in titles, aliases etc.)