diff --git a/README.md b/README.md
index 06bec253217..2ed11721836 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,12 @@ issues to fix and polish missing. But feedback on what is done and bug reports w
 ```
 go get github.com/grafana/grafana
 ```
+The above will give an error saying there is no go code. That is because the new backend parts are in the develop branch.
 
 Building
 ```
 cd $GOPATH/src/github.com/grafana/grafana
+git checkout -t origin/develop
 go run build.go setup (only needed once to install godep)
 go run build.go build
 ```
@@ -43,7 +45,7 @@ npm install -g grunt-cli
 grunt
 ```
 
-To rebuild on source change:
+To rebuild on source change (requires that you executed godep restore)
 ```
 go get github.com/Unknwon/bra
 bra run
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 77e14c04c3b..cd43f8d66f2 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -23,8 +23,8 @@ type DsAccess string
 
 type DataSource struct {
 	Id        int64
-	Version   int
 	AccountId int64
+	Version   int
 
 	Name              string
 	Type              DsType
diff --git a/src/app/features/account/partials/apikeys.html b/src/app/features/account/partials/apikeys.html
index cc78bf89d33..c88dcb8144a 100644
--- a/src/app/features/account/partials/apikeys.html
+++ b/src/app/features/account/partials/apikeys.html
@@ -6,14 +6,13 @@
 </topnav>
 
 <div class="gf-box" style="min-height: 500px">
-
 	<div class="gf-box-body">
 		<div class="editor-row">
 			<div class="section">
 				<form name="addTokenrForm" class="form-inline tight-form">
 					<ul class="tight-form-list">
 						<li class="tight-form-item">
-							Add a Token
+							Add a key
 						</li>
 						<li>
 							<input type="text" class="input-xlarge tight-form-input" ng-model='token.name' placeholder="Name"></input>
@@ -47,7 +46,6 @@
 				</table>
 			</div>
 		</div>
-
 	</div>
 </div>