Removed battery zshrc plugin and changed from snipmate to utilsnips (still needs configuring) and a few other bits