Some sweeping changes i made five months ago.
Merge pull request #2 from danneu/progress

Some sweeping unorganized changes i made many months ago.