make sure to check for untracked files when checking dirty status
Merge branch 'stash_untracked' into integration