Production Part 2

@whiskeylover, so I just finished incorporating my second round of production -> development integrations. Everything seems to be working fine and I have tested by checking out the code, and running it in a development on my local machine. So going to go ahead and merge in this branch!