Big merge 12/17/13

Merge this bitch!