add hint to use /bin/sh -e consistently (thanks, Steven!)

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
fixed unexpected keyword
archlinux: switched from htop to htop-solarized-vi
archlinux: switched from htop to htop-solarized-vi
Merge branch 'upstream-fixed' into athena