reconciliing everything, milkshare.py
trying to actually reconcile all the thigns
Merge pull request #2 from jkru/master

merge in reconciled repo