updating script to handle new format
Merge branch 'master' of github.com:mallarke/scripts

Conflicts:
	parse