Added fetch then pull, and changed alias for rebase then push.
Partial revert of commit 763b479. Changing html spaces from 2 to 4 again.
git update-submodule as per: http://stackoverflow.com/questions/1030169/git-easy-way-pull-latest-of-all-submodules#comment10383777_8084186