Use ~/.gnuais/config instead of ~/.gnuais.conf
Merge branch 'master' into ubuntu