Fixes #158 - moves 'welcome back' message into header
Merge pull request #161 from NotBobTheBuilder/issue158

Fixes #158 - moves 'welcome back' message into header
padding removed from header once greeting is closed
Merge pull request #162 from NotBobTheBuilder/issue158

Padding removed from header once greeting is closed
Create Vagrantfile, Puppet manifest to support #163

* Fixed loads of glitches in the Setup script. Some pretty heavy
repositioning went on there too.
* Created a very basic Vagrantfile
* Created a slightly more complex manifest which spins up all the
services.
* Added a .gitignore entry for the Vagrant support files.
Fixing typo
Added debugging features, also, autoload demo data
Various fixes to the Vagrant configuration

* Commented out the "mirror://" format as it's down during test - change
back if required.
* Move from turning on AllowOverride to putting the rewrite in a new
entry in /etc/apache2/conf.d
* As a result of that, move cfm2 into it's own /var/www/ directory.
* Add a pointer to the /var/www/cfm2 directory
Merge pull request #165 from JonTheNiceGuy/Issue163

Create Vagrantfile, Puppet manifest to support #163
Merge pull request #1 from CampFireManager/master

Bring local fork into line with Origin:master
This closes #116

* Add new placeholder entries on TextArea, TextBox and Multi-element
TextBoxes.
* Add placeholder fields in Object_Talk and Object_User templates and
classes.
* Amends Generic_Object class to include placeholder texts
Update init.pp - typo
Fixes #167; upgrades JQM 1.1.1 -> 1.3.1
Merge pull request #168 from NotBobTheBuilder/issue167

Fixes #167; upgrades JQM 1.1.1 -> 1.3.1
Merge pull request #166 from JonTheNiceGuy/master

This closes #116