ignore init_.pyc
stir algorithms and sip django
stir algorithm
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5
Merge branch 'marcia' into sprint5
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5

Conflicts:
	agdrift/__init__.pyc
Merge branch 'chance' into sprint5