Update Vagrantfile and htaccess.  Cleanup.  Add templates