Development with updated intraday increment update

Now that fluxtream has moved intraday into regular development branch, forking from there