Merge branch 'master' of https://github.com/jasonwryan/vimb

Conflicts:
	README.md

diff --cc README.md
index 60ee05f,12c32ee..0944100
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -42,13 -42,13 +42,14 @@@ the project page of [Vimb][]
  On Ubuntu these dependencies can be installed by
  `sudo apt-get install libsoup2.4-dev libwebkit-dev libgtk-3-dev libwebkitgtk-3.0-dev`.
  
- ## install
+ ## Install
  
- Edit config.mk to match your local setup.
+ Edit `config.mk` to match your local setup.
  
 -Edit `config.h` to match your personal preferences.
 +Edit src/config.h to match your personal preferences.
++Edit `src/config.h` to match your personal preferences.
  
- The default Makefile will not overwrite your customised `config.h` with the
+ The default `Makefile` will not overwrite your customised `config.h` with the
  contents of `config.def.h`, even if it was updated in the latest git pull.
  Therefore, you should always compare your customised `config.h` with
  `config.def.h` and make sure you include any changes to the latter in your