Merge branch 'master' of ssh://github.com/pmeth/opencfp
Reformatting
Merge remote-tracking branch 'chartjes/master'
adding some dependency declarations to the puppet manifest so vagrant up will work properly
updating Vagrantfile to eliminate warnings generated by vagrant 1.1
Added in support for using Faker for unit tests
Formatting changes
Formatting changes
Added in tests and TalkForm object
Helps if you actually add the file
adding a configuration file to customize setup
Merge pull request #12 from pmeth/config_file

adding a configuration file to customize setup
Merge pull request #10 from pmeth/vagrant_config

updating Vagrantfile to eliminate warnings generated by vagrant 1.1
Merge pull request #8 from pmeth/puppet_fixes

Puppet fixes
Added in templates from pull request