gitignore: Fix merge conflict and add Dockerfile.

Also remove .DS_Store for OS X.
Remove z because it didn't seem to be working.
bash_profile: Set time zone.
Bash: tweak some aliases.
bash_aliases: Use my docker_rails_app script instead of custom rails aliases.
gitconfig: better log dates and add a bunch of aliases.
gitignore: ignore .env files.

Used to set environment variables for my docker rails script.
Try to change the docker directory.

I'm not sure if this works or not...
vimrc: Turn on syntax completion.