Added benchmarking method & convert alias to method
Merge branch 'master' of https://github.com/ymis1080/dotfiles

Conflicts:
	pryrc