Updated sites to now be app.json and public.json

app.json maps to the /vagrant/app folder for dev view of unminified code
public.json maps to the /vagrant/public folder for staging view of minified code
Merge branch 'release/1.2'