Moves form templates up one level; Renamed Vagrantfile* templates Vagrantfile; #1227