Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Finished adding config file support
Fixed bug in yaffs2 cleanup
Fixed bug on cleanup after config file error
Merge pull request #245 from APriestman/master

Config file support for Yaffs2 images