Pin active_scaffold to the last known working ref.
Merge pull request #300 from VictorLowther/fix-busted-active-scaffold-for-now

Pin active_scaffold to the last known working ref.
add waffle.io badge
Merge pull request #302 from waffle-iron/master

waffle.io Badge
Added Gitter badge
Merge pull request #303 from gitter-badger/gitter-badge

Add a Gitter chat badge to README.md
Add demo-mode to KVM.

To use it:

1: Create an admin disk by running kvm-admin with --create-image <file>
2: Setup the admin node as normal.
3: Once the admin node has converged:
   1: rm /etc/udev/rules.d/*persist*
   2: halt
4: After the system has halted, kill the kvm-admin script.  This
   will cause the disk the admin node was using to be converted into
   a compressed qcow2 image stored in <file>
5: When you are ready to run the demo, run kvm-admin --demo <file>
Make kvm-admin fail when passed an invalid option.

Better to do this instead of spinning forever.
Fix stupid typo