Merge branch 'master' into eapi

* master:
  Reset password to default
  Improved output formatting of time, timezone and uptime facts. Corrected time fact to include timezone offset. Added relevant comments. Reintroduced vendor and var _name facts. Reintroduced ConfigObj usage.
  Improved output formatting of time, timezone and uptime facts. Corrected time fact to include timezone offset. Added relevant comments. Reintroduced vendor and var_name facts. Reintroduced ConfigObj usage.
  Reverted changes to getfreeMem and gettotalMem
  Delete my test print lines
  fixed indentation of some lines
  fixed indents
  fixing
  added func and more help for user using it as a program
Allowed input of username and password

Added functionality to input username and password at the command-line.
Only works with eapi, similar method needs to be added to individual
platforms setLogin(self, username, password).

Also allowed for -f or -c to be used if either is entered, fancy
redundancy that was already in argparse, but not being taken advantage
of.
Merge branch 'eapi'

* eapi:
  Allowed input of username and password