Merge branch 'master' into codehighlight

* master:
  Don't automatically include "v"  from git
  Get versioninfo from the git repository

Makefile

@@ -1,7 +1,10 @@
+GITREV=`git describe --tags | cut -c 2-`
+LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'"
+
 GOCMD=go
-GOINSTALL=$(GOCMD) install
-GOBUILD=$(GOCMD) build
-GOTEST=$(GOCMD) test
+GOINSTALL=$(GOCMD) install $(LDFLAGS)
+GOBUILD=$(GOCMD) build $(LDFLAGS)
+GOTEST=$(GOCMD) test $(LDFLAGS)
 GOGET=$(GOCMD) get
 BINARY_NAME=writefreely
 
@@ -29,6 +32,6 @@ ui : force_look
 
 clean :
 	cd less/; $(MAKE) clean $(MFLAGS)
-	
+
 force_look : 
 	true

app.go

@@ -33,10 +33,11 @@ const (
 
 	serverSoftware = "WriteFreely"
 	softwareURL    = "https://writefreely.org"
-
-	softwareVer = "0.3"
 )
 
+// Software version can be set from git env using -ldflags
+var softwareVer = "0.3"
+
 var (
 	debugging bool