Palm Springs

Updated for DevSummit
Merge branch 'master' into nick-working
Merge pull request #73 from nixta/nick-working

Nick working