From 625332692f1493084e7ca7416ff120d671a16cbd Mon Sep 17 00:00:00 2001
From: Deluan <dquintao@adparlor.com>
Date: Fri, 26 Feb 2016 11:39:14 -0500
Subject: [PATCH] Fixing build again

---
 .gopmfile |  2 +-
 README.md | 31 ++++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.gopmfile b/.gopmfile
index d6bfd6c31..031183d37 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -2,7 +2,7 @@
 path = github.com/deluan/gosonic
 
 [deps]
-github.com/astaxie/beego = tag:v1.6.0
+github.com/astaxie/beego = commit:92d0b9a
 github.com/dhowden/itl = commit:35d15a3
 github.com/HouzuoGuo/tiedot = tag:3.2
 github.com/smartystreets/goconvey = tag:1.6.0
diff --git a/README.md b/README.md
index 4846b033c..e48fd6c72 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-GoSonic 
+GoSonic
 =======
 
 [![Build Status](https://travis-ci.org/deluan/gosonic.svg?branch=master)](https://travis-ci.org/deluan/gosonic)
@@ -18,8 +18,8 @@ The project's main goals are:
     [DSub](http://www.subsonic.org/pages/apps.jsp#dsub),
     [Jamstash](http://www.subsonic.org/pages/apps.jsp#jamstash))
 * Use all metadata from iTunes
-* Use iTunes interface to manage your music
-* Update play counts, last played dates, ratings, etc..  on iTunes
+* You can keep using iTunes to manage your music
+* Update play counts, last played dates, ratings, etc..  on iTunes (at least on Mac OS)
 * Learning Go ;) [![Gopher](https://blog.golang.org/favicon.ico)](https://golang.org)
 
 Currently implementing [API version](http://www.subsonic.org/pages/api.jsp#versions):
@@ -27,16 +27,33 @@ Currently implementing [API version](http://www.subsonic.org/pages/api.jsp#versi
 * _1.0.0 &larr; In progress_
 * 1.2.0
 
+### Development Environment
+
+You will need to install [Go 1.6](https://golang.org/dl/)
+    
+Then install dependencies:
+```
+$ go get github.com/beego/bee   
+$ go get github.com/gpmgo/gopm
+$ gopm get -v -g
+```  
+
+From here it's a normal Go development cycle:
+
+* Test with `go test ./.. -v`
+* Start local server with `bee run`
+* Start test runner with `goconvey` 
+
 
 ### Useful Links
 
 #### Frameworks/Projects
-https://github.com/golang/go/wiki/Projects
-https://golanglibs.com/
-https://github.com/deluan/tuner
+* https://github.com/golang/go/wiki/Projects
+* https://golanglibs.com/
+* https://github.com/deluan/tuner
 
 #### REST/Web
-http://beego.me/
+* http://beego.me/
 
 #### DB
 https://github.com/HouzuoGuo/tiedot