This stuff happens
Re-added source
Cleanup
Merge pull request #179 from joshbeitler/new_build

New build
Preparing for message system
Merge pull request #182 from joshbeitler/develop

Develop