Merge pull request #1315 from aledsage/0.7.0-M1-docs-20140409

0.7.0-M1 docs fixes