merge uranthers stuff

diff --cc Makefile
index b0c4e54,a0be348..501a859
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -10,9 -10,11 +10,14 @@@ all: uzbl uzblctr
  
  PREFIX?=$(DESTDIR)/usr
  
+ # When compiling unit tests, compile uzbl as a library first
 -test: uzbl.o
++tests: uzbl.o
+       $(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
+       cd ./tests/; $(MAKE)
+ 
 +test: uzbl
 +      ./uzbl --uri http://www.uzbl.org --verbose
 +
  test-dev: uzbl
        XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
  

diff --cc README
Simple merge

diff --cc docs/CONTRIBUTING
index c26e49a,5a88330..a45618a
--- 1/docs/CONTRIBUTING
--- 2/docs/CONTRIBUTING
+++ b/docs/CONTRIBUTING
@@@ -93,6 -90,11 +93,13 @@@ is, please supply
  ### Memory leak checking
      valgrind --tool=memcheck --leak-check=full ./uzbl
  
+ ### Writing unit tests
++
+ If you can, write a unit test for a bugfix or new functionality. Add relevant unit
+ tests to existing .c files in tests/. Others should be made in new source files with
+ corresponding changes to the tests/Makefile.
++Run all tests with `make tests`
+ 
  ### Debugging / backtraces
  
  * compile with -ggdb (enabled by default on experimental tree)

diff --cc docs/TODO
Simple merge