Modified dotfiles for linux and os x
Merge remote-tracking branch 'origin/master'

Conflicts:
	moveFilesOnly.sh