chmod +x Setup.lhs
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
preserve truncation of towers in lift2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Numeric/AD/Internal/Tower.hs (*! and +! changed to * and +)
fixup merge (missing a <<<)
Merge pull request #20 from barak/master

tower efficiency fix
Merge pull request #21 from barak/master

merge into dev branch