Heading back into master

Changes and junk to pass the test suite and merge, major functionality
still pending on work being done by @hill1303 and @lotzi11 on schedule
saving. Also need @gaurimishra  changes on completions. Expect
@eaholt06 to continue expanding test suite.