not sure what changed... indentation?
Merge branch 'master' of https://github.com/julianmichael/.gotfiles

* 'master' of https://github.com/julianmichael/.gotfiles:
  fixed bad alias of  plus slight refactor
  revamped and reorganized a bunch of stuff
bit of vim fixes and no longer sourcing bashrc in bash_profile
Merge branch 'master' of https://github.com/julianmichael/.gotfiles

* 'master' of https://github.com/julianmichael/.gotfiles:
  accounted for powerline and added a bit to vimrc
  made some changes idk lol it was yesterday

Conflicts:
	save/modified/.vimrc