Merge commit 'origin/master'

diff --cc sface/mainwindow.py
index b9de6fa,fdd52a5..6a0175e
--- 1/sface/mainwindow.py
--- 2/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@@ -109,9 -100,9 +109,9 @@@ class MainWindow(QWidget)
          layout.addWidget(self.screens)
          layout.addLayout(hlayout)
          self.setLayout(layout)
-         self.resize(800, 600)
+         self.resize(800, 500)
  
 -        for link in (self.nav.main, self.nav.config):
 +        for link in (self.nav.main, self.nav.config, self.nav.help):
              self.connect(link, SIGNAL('linkActivated(QString)'),
                           self.animateToScreen)
  

diff --cc sface/screens/mainscreen.py
Simple merge