Fixed merge problem
Merge branch 'master' into develop

* master:
  Changed powerline settings
  Backup of .zshrc
  Reloaded
Vim Auto save
Added theme file back
Merge branch 'release/0.0.3'

* release/0.0.3:
  Added theme file back
  Vim Auto save
  Fixed merge problem