Branch fix

@robguthrie  I branched off `origin master`, then pulled in `loomio-production master`

the diff looks way bigger than when I last looked so maybe something is weird with `.gitignore` ?
delete or use as best suits