importing
Have nginx start at boot time
Converted to conf.d from sites-enabled
Added puppet2 to nodes.pp
Updated cat-pictures port and directory.
Merge branch 'master' of https://github.com/bwainstock/puppet