little things
merge from work
merge from master
remove dev6 key
Merge branch 'work' of github.com:bukzor/dotfiles into work
better, faster, stronger remote-branch deletion
Merge branch 'work' of github.com:bukzor/dotfiles into work
Merge branch 'work' of github.com:bukzor/dotfiles into work
ignore cep8
fix devall
Merge branch 'master' into work
work.
Merge commit '87a11f8' into work

Conflicts:
	.bashrc.atwork
Merge branch 'master' into work
better syntastic pylint
merge from buck/master
merge from buck/work to buck/master
Merge branch 'master' of github.com:bukzor/dotfiles

Conflicts:
	.bash_aliases
	.bashrc
	bin/git-prune-branches
Merge remote-tracking branch 'buck/work'