tons of changes; v2.0 proposal
oops, missed a file
changed two characters
Fixing merge conflict
Merge branch 'garrettw-master'