Updating

Fixes for Xcode 6. Updated some docs and working on new doc system.
typo - `exapand` -> `expand`