Merge branch 'master' of github.com:ricobeck/alcatraz-packages into ricobeck-master

Conflicts:
	packages.json