sync
Merge branch 'master' of github.com:itamblyn/VASP

Conflicts:
	dos_reader.py
fixed pdos_select
Merge branch 'master' of github.com:itamblyn/VASP

Conflicts:
	pdos_select.py