Merge branch 'test' of github.com:urbit/urbit into test

Makefile

@@ -71,9 +71,9 @@ INCLUDE=include
 MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
-# 	-DGHETTO
+# 	-DGHETTO \
 #   -DHUSH
-CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \
+CFLAGS= $(COSFLAGS) -O3 -ffast-math \
 	-funsigned-char \
 	-I/usr/local/include \
 	-I/opt/local/include \
@@ -473,6 +473,7 @@ debinstall:
 
 clean:
 	$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES)
+	$(RM) -r debian/files debian/urbit*
 
 # 'make distclean all -jn' ∀ n>1 still does not work because it is possible
 # Make will attempt to build urbit while it is also cleaning urbit..

README.md

@@ -208,5 +208,7 @@ pier. Your original ticket will still work.
 Contributing
 ------------
 
-If you're interested in contributing to urbit development come and
-`:talk` with us. We'll help you get oriented and up to speed.
+The first step in contributing to urbit is to come and join us on `:talk`. 
+
+For more detailed instructions check out 
+[`contributing.md`](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md),.

debian/docs

@@ -1 +1 @@
-README.markdown
+README.md

noun/manage.c

@@ -593,12 +593,12 @@ u3m_bail(u3_noun how)
       str_c[2] = ((how >> 16) & 0xff);
       str_c[3] = ((how >> 24) & 0xff);
       str_c[4] = 0;
-      fprintf(stderr, "bail: %s\r\n", str_c);
+      fprintf(stderr, "\r\nbail: %s\r\n", str_c);
     } 
     else {
       c3_assert(_(u3ud(u3h(how))));
 
-      fprintf(stderr, "bail: %d\r\n", u3h(how));
+      fprintf(stderr, "\r\nbail: %d\r\n", u3h(how));
       u3m_p("bail", u3t(how));
     }
   }

outside/scrypt/crypto_scrypt.h

@@ -30,7 +30,6 @@
 #define _CRYPTO_SCRYPT_H_
 
 #include <stdint.h>
-#include <emmintrin.h>
 
 void smix(uint8_t *, size_t, uint64_t, uint32_t *, uint32_t *);
 void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,