Added some notes on what the map and badges mean.
Added a small section on branching.
A number of small changes to the testing files.
Merge pull request #82 from marioa/2013-05-oxford-dtc

2013 05 oxford dtc