MVP?
Merge pull request #11 from seanot/jeff

MVP?
more minor shit
fixed conflicts