bashrc-phq2.m4: add bash completion
conkyrc: minor edit to labels.
bashrc-phq0.m4: Change extension of todo.txt > md

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
gitconfig: Add alias for displaying a neat log
bashrc-phq2.m4: add alias for installing ports with portmaster
Merge branch 'dev' of https://github.com/andrewjamesturner0/dotfiles into dev
conkyrc: minor edit to labels.
bashrc-phq0.m4: Change extension of todo.txt > md

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
gitconfig: Add alias for displaying a neat log
bashrc-phq2.m4: add alias for installing ports with portmaster
bashrc-phq2.m4: edit alias for installing ports with portmaster

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
bashrc-phq2.m4: add alias for updating ports tree and checking for new versions of installed ports

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
Merge branch 'dev' of github.com:andrewjamesturner0/dotfiles into dev

Conflicts:
	bashrc-phq2.m4
Merge branch 'dev' of https://github.com/andrewjamesturner0/dotfiles into dev

Conflicts:
	conkyrc