Merge installer branch.

diff --cc ChangeLog
index e5398c26f1b5f3c3b617b7991acb62558545d623,e23e96c217fe64b05417fc5093fddd684b821f66..fea0ebc786c29698b8f9438dbe4bee76dc558109
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2014-01-28  Carl Hetherington  <cth@carlh.net>
  
 +      * Try to prevent Windows machines going to sleep during encodes.
 +
+       * Add option to not install main program / server on Windows.
+ 
  2014-01-26  Carl Hetherington  <cth@carlh.net>
  
        * Change default JPEG2000 bandwith to 100MBps.