Merge pull request #6 from ohle/upstream

Guess inventory slot chosen at "[foo or ?*]" prompt
Merge pull request #7 from ohle/upstream

#praytime for estimating prayer timeout, other fixes
typo fix
clean up whitespace
Merge remote-tracking branch 'taeb/master'