Added git ec = edit config, and better pull all
Merge branch 'master' of github.com:brendanheywood/scripts

Conflicts:
	TODO