Update setup
Merge branch 'master' of github.com:jflanigan/jamr