log ins are different in 1.6
Merge branch 'master' of https://github.com/heydabop/silverfish