Update master to v2

I'm setting up the ansible script to deploy to production from the master branch, so this is kinda necessary.