Merge branch 'develop' of ssh://github.com/lavabit/magma into develop

2 files changed, 5 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 45f733f4..9cadd5d2 100644
--- a/Makefile
+++ b/Makefile
@@ -222,16 +222,16 @@ LDFLAGS                      ?=
 LDFLAGS_COMBINED              = -rdynamic $(LDFLAGS)
 
 # Archiver Options
-ARFLAGS                      ?= rcs
+ARFLAGS                       = rcs
 
 # Strip Options
-STRIPFLAGS                   ?= --strip-debug
+STRIPFLAGS                    = --strip-debug
 
 # GProf Options
-GPROF                        ?= -pg -finstrument-functions -fprofile-arcs -ftest-coverage
+GPROF                         = -pg -finstrument-functions -fprofile-arcs -ftest-coverage
 
 # PProf Options
-PPROF                        ?= -lprofiler
+PPROF                         = -lprofiler
 
 # Miscellaneous External programs
 MV                            = mv --force
diff --git a/README.md b/README.md
index 4810c1e3..593e2683 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ vagrant init lavabit/magma; vagrant up --provider libvirt
 vagrant init lavabit/magma; vagrant up --provider hyperv
 ```
 
-Images are available for alternate platforms [here](https://atlas.hashicorp.com/lavabit).
+Images are available for alternate platforms [here](https://app.vagrantup.com/lavabit).
 
 # Credits