added colinmcnamara.rst, updated .gitignore not to merge tests