Merge branch 'master' of git://github.com/idris-lang/Idris-dev
Merge branch 'master' of github.com:edwinb/Idris-dev
Removed '_|_' as a built in declaration and renamed it to 'Void',
'FalseElim' now 'VoidElim' to match up
Renamed VoidElim to void in order to ensure further consistency
Changing all lambdas to use comma separated style (e.g. '\x => \y =>' to '\x,y =>')
Parameters should be made 'static'

When a static argument has parameters, those parameters should also be
made static in all cases. Less restrictive than the rule for indices,
which requires that the index be uniquely inferrable from the static.
Parameters should be made 'static'

When a static argument has parameters, those parameters should also be
made static in all cases. Less restrictive than the rule for indices,
which requires that the index be uniquely inferrable from the static.
Merge branch 'partial-eval' of github.com:edwinb/Idris-dev into partial-eval
Merge branch 'master' into lambdastyle

Conflicts:
	libs/prelude/Prelude/Vect.idr
Turn pureM into a function
added zipWith3 and associated functions for streams
Parameters should be made 'static'

When a static argument has parameters, those parameters should also be
made static in all cases. Less restrictive than the rule for indices,
which requires that the index be uniquely inferrable from the static.
Extend PE to look under pattern matching defs

This means that marking higher order function arguments as [static] will
now potentially have some effect (and possibly type classes later...)
Undo log level 0!
Improve PE for class constraints and HOFs

Reinstate and improve check for progress in PE (which is necessary in
mutually defined functions in particular) and change RHS of more complex
PE definitions to call the specialised function, rather than rewriting
the RHS directly, so that progress can be detected more easily (and so
that more reduction can happen where possible)
Merge branch 'master' of github.com:edwinb/Idris-dev into partial-eval
Merge branch 'partial-eval' of github.com:edwinb/Idris-dev into partial-eval
Merge pull request #1638 from johnny-john/lambdastyle

Changing all lambdas to use comma separated style (e.g. '\x => \y =>' to...
Merge pull request #1651 from Melvar/pureM-function

Turn pureM into a function
Merge pull request #1653 from japesinator/add_zip3_streams

added zipWith3 and associated functions for streams