fix bashrc and conky rc for four cores
Merge branch 'master' into lxde