Added timeout argument to container and image providers that gets passed to shell_out command.
Changed timeout resource attribute to be cmd_timeout to prevent collisions
Added option to perform a docker build by passing the directory that contains the dockerfile
Added missing close of if block
Updated timeout value to have a default instead of using ||. Updated dockerfile_directory attribute to be path instead.
Merge changes from blarghmatey
Add cmd_timeout to import