Commit a27c1e47 authored May 17, 2016 by Michael DM Dryden

Merge branch 'develop' into 'master'

Add CI and changes to shutter



See merge request !2