update buildscript
Fixes for datetime on numpy 1.6
Fix for datetime on numpy 1.6
Add conda build recipe for devel branch
Fix windows build error
Fix windows build error for real this time
Revert "Make (None, float) promote to floating"

This reverts commit 57ef4bf07badc7d2f87086d7156d517fc38cb1e6.
Revert "Initial support for float/double or None"

This reverts commit 2055801fb647a72f409ae0d6bf7b68c061871882.
Update documentation for datetime
Merge branch 'devel'