Updated puppetfile
Updated makefile
Upgrading capistrano (WIP).