7 files changed, 15 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index 6c26e4112..ab788317c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ env:
   - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
 before_install:
   - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
+  - openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
 install:
   - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
   - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
diff --git a/docs/Differences-from-TMK.md b/docs/Differences-from-TMK.md
index 8b4357095..10ca329dc 100644
--- a/docs/Differences-from-TMK.md
+++ b/docs/Differences-from-TMK.md
@@ -5,4 +5,3 @@ Understanding the essential changes made on the [tmk_keyboard firmware](http://g
 | Maintainer                   |hasu  (@tmk)           |Jack Humbert et al.      |
 | Build path customization     | `TMK_DIR = ...`       | `include .../Makefile`  |
 | `keymaps` array data | 3D array of `uint8_t`  holding **keycode**      | 3D array of `uint16_t` holding **keycode**  |
-| `fn_actions` array data  | 1D array of `uint16_t`  holding **action code** | 1D array of `uint16_t` holding **action code**  |
\ No newline at end of file
diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h
index e870835d8..2091999bb 100644
--- a/keyboards/ergodox/config.h
+++ b/keyboards/ergodox/config.h
@@ -3,7 +3,7 @@
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    40
+#define MOUSEKEY_TIME_TO_MAX    60
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY 0
 
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index aa17c3e8d..cc8aa3d40 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -60,6 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    15
 
+#define PREVENT_STUCK_MODIFIERS
+
 #define USB_MAX_POWER_CONSUMPTION 500
 
 /*
diff --git a/secrets.tar.enc b/secrets.tar.enc
new file mode 100644
index 000000000..03fdf41c8
--- /dev/null
+++ b/secrets.tar.enc
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 6bafd1941..5b0951c6e 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -5,7 +5,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
         exit_code=0
-        NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+        NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)'  | grep -Ev '^(docs/)' | wc -l)
         if [[ $NEFM -gt 0 ]] ; then
                 echo "Making all keymaps for all keyboards"
                 make all-keyboards AUTOGEN="true"
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 718daaa29..a5bbe70ec 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,6 +7,12 @@ rev=$(git rev-parse --short HEAD)
 git config --global user.name "Travis CI"
 git config --global user.email "jack.humb+travis.ci@gmail.com"
 
+chmod 600 id_rsa_qmk_firmware
+chmod 600 qmk.fm
+eval `ssh-agent -s`
+ssh-add id_rsa_qmk_firmware
+ssh-add qmk.fm
+
 if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
 increment_version ()
@@ -17,14 +23,14 @@ increment_version ()
   echo -e "${new// /.}"
 } 
 
-NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
 if [[ $NEFM -gt 0 ]] ; then
         echo "Essential files modified."
         git fetch --tags
         lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
         newtag=$(increment_version $lasttag)
         git tag $newtag
-        git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware
+        git push --tags
 else
         echo "No essential files modified."
 fi
@@ -34,7 +40,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
         make ergodox-ez AUTOGEN=true
 
         cd ..
-        git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
+        git clone git@github.com:qmk/qmk.fm.git
         cd qmk.fm
         #git submodule update --init --recursive
         #rm -rf keyboard