Merge branch 'master' into lucid.co.nz
Merge remote-tracking branch 'origin/fryspharmacy' into lucid.co.nz
Change slider images to PNGs and a few minor tweaks
Merge branch 'lucid.co.nz' of github.com:luciddesign/bootstrapify into lucid.co.nz