Merge branch 'master' into micropeak-logging

diff --combined configure.ac
index e3b1185fece9022c5b1b29f1a46922d02adcf691,0fcd97e27bac6349850b06cc8b8d7e7a509eef1e..55dd20ec5cbd9ceb2c6b9925d809b4820336faf5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -149,8 -149,7 +149,8 @@@ altoslib/Makefil
  altosui/Makefile
  altosui/AltosVersion.java
  altosui/Info.plist
 -altosui/libaltos/Makefile
 +libaltos/Makefile
 +micropeak/Makefile
  altosdroid/Makefile
  altosdroid/local.properties
  ao-tools/Makefile
@@@ -164,6 -163,7 +164,7 @@@ ao-tools/ao-load/Makefil
  ao-tools/ao-telem/Makefile
  ao-tools/ao-stmload/Makefile
  ao-tools/ao-send-telem/Makefile
+ ao-tools/ao-sky-flash/Makefile
  ao-utils/Makefile
  src/Version
  ])