added some more aliases
Merge branch 'master' of https://github.com/penguinpowernz/dotfiles

Conflicts:
	.aliases
added spring rails aliases and lspkg, removed deb
added epoch function
made hax accept a subfolder to jump to