Additions to .vimrc and plugin update

- Moved from powerline to airline
- Merged in some of the good stuff from my old vimrc