Updating Appengine-Endpoints archetype
Merge remote-tracking branch 'origin/master' into brandon-update

Conflicts:
	archetypes/appengine-endpoints/README.md
Merge pull request #76 from branflake2267/brandon-update

Prepping endpoints archetype