Updated aliases to relocate and thin things out.
Merge branch 'master' of github.com:castillar/ducking-octo-bear

Merging to solve file conflicts