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

1 files changed, 8 insertions, 2 deletions

diff --git a/README.md b/README.md
index 18b5bacc..d8106911 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Description
 
-Magma was originally designed and developed by Ladar Levison for lavabit.com. The current release is currently under heavy development, and some of the features and functions contained herein are unstable. The SMTP, POP, and IMAP protocol handlers are reasonably mature. The DMTP and HTTP (and the bundled webmail system) are still in development. Happy hacking.
+Magma was originally designed and developed by Ladar Levison for lavabit.com. The current release is currently under heavy development, and some of the features and functions contained herein are unstable. The SMTP, POP, and IMAP protocol handlers are reasonably mature. The DMTP, DMAP and HTTP implementations (along with the bundled webmail system) are still in development. Happy hacking.
 
 # Downloads
 
@@ -41,6 +41,7 @@ Princess Levison
 Ryan Crites    
 Sean Benson    
 Stephen Watt    
+Jacob Adkins    
 
 And the army of Kickstarter supporters who contributed to this project.
 
@@ -102,8 +103,13 @@ yum install memcached
 service memcached start
 chkconfig memcached on
 ```
+### Compiling (The Short Way)
 
-### Compiling
+```shell
+make all
+```
+
+### Compiling (The Long Way)
 
 To link up the development and build scripts run the linkup.sh. This will create a bin folder in your home directory, if it doesn't already exist, and create symbolic links to the scripts and tools used to build, run and test magma. The commands below assume the bin directory is in your PATH. If it isn't, or you simply don't want to create the symbolic links, you can also run the shell scripts directly from their location in the dev/scripts folder. To execute the linkup.sh script: