Merge branch 'lua'

Conflicts:
	src/specials.c

diff --cc src/conky.c
Simple merge

diff --cc src/conky.h
Simple merge

diff --cc src/specials.c
index 0c6f84c,a299cf7..5c45f1c
--- 1/src/specials.c
--- 2/src/specials.c
+++ b/src/specials.c
@@@ -42,10 -42,10 +42,10 @@@ struct special_t *specials = NULL
  
  unsigned int special_count;
  
 -#ifdef X11
  int default_bar_width = 0, default_bar_height = 6;
 +#ifdef X11
  int default_graph_width = 0, default_graph_height = 25;
- int default_gauge_width = 50, default_gauge_height = 25;
+ int default_gauge_width = 40, default_gauge_height = 25;
  #endif
  
  /*