Moved aliases to an 'aliases.py' file
Merge branch 'aliases-file'

* aliases-file:
  Moved aliases to an 'aliases.py' file