more minor shit
fixed conflicts
Merge pull request #13 from seanot/geoff_dot_self

Geoff dot self