added maven aliases; removed .bash/paths
fixed merge conflict