Adam latest - some smoke (static)

Signed-off-by: Adam Palmer <ad@palmerama.tv>
Merge branch 'master' of https://github.com/RhythmDigital/selectscience-ar