Massive Merge

This has all of the client code and all of the updates from hall5714/master as of:
### 12 December 2013 02:18 AM

### BE VERY CAREFUL WITH THIS PULL REQUEST, IT IS **HUGE**!!!!