Merge pull request #139 from rossbruniges/stage

Fixing the final dodgt bit of template code - this for some reason wasn't on dev...
Merge pull request #142 from rossbruniges/stage

Fix broken logic and a quick test hack
Merge pull request #143 from rossbruniges/stage

Foo
Merge pull request #144 from rossbruniges/stage

Allowing Will/Ben the possibility to hack the date but not confuse PST
Merge pull request #146 from rossbruniges/stage

Missed one - missed an about.html date to use the hacked PST
Fix bug #147 - ammending site design and data for when the winners are announced
Merge pull request #148 from rossbruniges/final-homepage

Fix bug #147 - ammending site design and data for when the winners are announced
Updates from Will and Ignite team
Merge pull request #149 from rossbruniges/final-homepage

Updates from Will and Ignite team
Merge in and fix conflicts from dev