fixed pacnew merge and added encfs alias