some osx aliases in the bashrc, minor tweak to portopen helper scripts, moved the vim temp directory (lol security)
openvz aliases
Resolved merge issues, reorganized bashrc