Please check this over. The only thing I have left todo is set up auto deployment. But I will do that on another branch, I just want to get this merged in. It works with the new files Sonny sent. Please ignore the .dat file diffs, there was no way around that.
@thaimp @rupakhet