more connection tweeks using the firegreet service and some bug fixes

Ignore-this: 120631f3b8aaf2c7c46cf734c138dbfa

darcs-hash:20131108202856-c21fe-1872eaadb6971256693895c8f9d32d3cf8ab6bc8
Merge branch 'master' into moc_parse