Added directory todo
Updated gitignore
Merge branch 'master' of https://github.com/westleyrussell/SPGammaIota

Conflicts:
	SigmaPi/SigmaPi/__init__.pyc
	SigmaPi/SigmaPi/settings.pyc