Updating skeleton a bit.
Merge branch 'master' of github.com:sporkmonger/skeleton

Conflicts:
	README