Update files ack should ignore.
Update virtualenv configuration.
Show timestamps in bash history.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Enable virtualenv for loki.

Conflicts:
	.bashrc