Merge pull request #56 from LukeAskew/master

Various fixes; update to 0.4.0
Add watcher to images

Affect #50
Merge branch 'master' of github.com:resource/fabricator

* 'master' of github.com:resource/fabricator: