handle flavor parameter

Change-Id: I7a2dd86bc250814cba37617d6de06fdb96825d28
timeout increase and check for instance in ERROR state

Change-Id: Ide99c1f42cecc76da81495d54c70d06ac99ba458
Increase timeout to 1 hour if diagnostics are unavailable.

Change-Id: I0cb9f95c7c1407d7a6885207168ccda9cf2aaa02
correct code formatting

Change-Id: I2a4c87f46a9bfb597570e7de187f5f2bf1c7de15
Merge branch 'master' into feature/floating_ip

Conflicts:
	novaimagebuilder/StackEnvironment.py
Added a logging statement and a docstring