Merge pull request #292 from jeffwilcox/dev

Preparing to merge dev to master
Merge pull request #293 from WindowsAzure/dev

Windows Azure Scheduler Preview