- Fixed a parameter name
- Added a timeout for pixmap fetching
Merge branch 'master' of github.com:BigVikingGames/generator-core

Conflicts:
	lib/generator.js