Update TODO.txt per Jaryd Malbin's suggestion
Configure Firefox for fixtracking.com by copying over a profile. The profile was created on Firefox 31.
Merge branch 'duckduckhack-vm' of github.com:mikedep333/duckpan-vagrant into duckduckhack-vm

Conflicts:
	TODO.txt