Merging latest client changes
Merge branch 'jeff_working_single_thread' of https://github.com/evanlouie/chicken_wing into jeff_working_single_thread