# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1511553953 18000
# Node ID 3ab791da67778c481c3759bda40bf6b170006389
# Parent  1cd90a0458e45ddfcb5b8b988133bf02a29f84c7# Parent  1ecae6c99d544d8dd3865ebce6cb2d6a9e912fca
Merge.

diff -r 1cd90a0458e4 -r 3ab791da6777 bash_profile
--- a/bash_profile	Fri Nov 24 15:05:07 2017 -0500
+++ b/bash_profile	Fri Nov 24 15:05:53 2017 -0500
@@ -15,7 +15,7 @@
     fi
 }
 
-export PATH=~/bin:~/lib/dotfiles/bin:~/.roswell/bin:/usr/local/share/python:/usr/local/bin/:$PATH
+export PATH=~/bin:~/lib/dotfiles/bin:~/lib/dotfiles/roswell:/usr/local/share/python:/usr/local/bin/:$PATH
 
 alias h='hg'
 alias g='git'
diff -r 1cd90a0458e4 -r 3ab791da6777 bin/epochmilliseconds
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/epochmilliseconds	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+python2 -c 'import time; print int(time.time() * 1000)'
diff -r 1cd90a0458e4 -r 3ab791da6777 bin/epochseconds
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/epochseconds	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+date '+%s'
diff -r 1cd90a0458e4 -r 3ab791da6777 fish/config.fish
--- a/fish/config.fish	Fri Nov 24 15:05:07 2017 -0500
+++ b/fish/config.fish	Fri Nov 24 15:05:53 2017 -0500
@@ -65,18 +65,14 @@
     end
 end
 set -gx PATH "/sbin"
-prepend_to_path "/usr/local/opt/postgresql@9.6/bin"
 prepend_to_path "/usr/sbin"
 prepend_to_path "/bin"
 prepend_to_path "/usr/bin"
 prepend_to_path "/usr/local/bin"
-prepend_to_path "/Library/TeX/texbin/"
-# prepend_to_path "/usr/local/share/python"
 prepend_to_path "/usr/local/sbin"
-prepend_to_path "/usr/local/share/npm/bin"
+prepend_to_path "$HOME/lib/dotfiles/roswell"
 prepend_to_path "$HOME/lib/dotfiles/bin"
 prepend_to_path "$HOME/lib/hg/hg"
-prepend_to_path "$HOME/.roswell/bin"
 prepend_to_path "$HOME/bin"
 
 set BROWSER open