Phase II Ready
Phase II Ready

Fixes for Phase II
Merge pull request #40 from jakebeinart/master

Looks good. You're ready for Phase III.