Added evaluation of conditional expressions
Added parsing of conditionals
Added conditional tests and minor bug fixes