Merge branch 'master' of github.com:jonathanwgoodwin/dds2
Merge branch 'master' of github.com:jonathanwgoodwin/dds2
Everyone uses globals right?
Its legit.

Added a mkdir before the convert shell script.
Added a little makefile to clean this thing up now that we can upload
thingies.
derp
Fixed the deck_user problem
Merge pull request #6 from pranav/master

Decks are now owned by users. YAY!
Refactored init.pp for the client
Update init.pp
Added mysql and fixed php5-ldap
Fixed some puppet module stuff and made a better Makefile
Added a symlink to map templates and slides
Most important htaccess file
I should probably add the apache2-php module
Added PuppetDB constants in config.php
Merge branch 'master' of github.com:jonathanwgoodwin/dds2 into psql
Merge branch 'master' of github.com:crew/dds2
Added a $pgconn to connect to the psql
Added a class for dealing with Machines