Add shell alaises, update global gitignore
Update Rakefile
Merge branch 'master' into linux