General deletion of comments, removing repeat type entirely for now, other fixes
oops, guess refactoring didn't stick
oops, guess refactoring didn't stick
oops, guess refactoring didn't stick
Conflicts
Whooo state transitions! Probably
Merge pull request #3 from btparker/develop

Develop