remove unused imports - sys, random
PEP8: Imports should usually be on separate lines

http://www.python.org/dev/peps/pep-0008/#imports
PEP8: Separate top-level function and class definitions with two blank lines.

http://www.python.org/dev/peps/pep-0008/#blank-lines
Whitespace changes for consistency
PEP8: Untabify

http://www.python.org/dev/peps/pep-0008/#tabs-or-spaces
PEP8: Surrounding space consistency (commas and operators)
PEP8: Consistantly use 4 spaces for indent (was a mix of 4 and 8)

http://www.python.org/dev/peps/pep-0008/#indentation
PEP8: Comparisons to None should always be done with is or is not, never the equality operators.

http://www.python.org/dev/peps/pep-0008/#programming-recommendations
PEP8: Object type comparisons should always use isinstance() instead of comparing types directly

http://www.python.org/dev/peps/pep-0008/#programming-recommendations
Merge commit '79b5b22f26cb79fe302535d7dbce444fddabf09b'

Conflicts:
	src/cuisine.py
Merge commit '0d1b5f385b45bd5238822b41c2b1b3c6268f3e09'

Conflicts:
	src/cuisine.py