Appease fussy gcc 4.8.2 in Ubuntu 14.04
Merge branch 'binary_weights_and_parameters'

Again, because I forgot there was a commit I made to sort compiling on
Ubu 14.04