anchor tags in docs, some additional edits to docs
syntax highlighting for software guide
fixed keyword for config file
fixed merge conflict