diff --git a/config/ponyfm.php b/config/ponyfm.php
index e10a1967..1203dd76 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -28,4 +28,16 @@ return [
 
     'sendfile' => env('USE_SENDFILE', true),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Google Analytics ID
+    |--------------------------------------------------------------------------
+    |
+    | If provided, Pony.fm will track activity in the given Google Analytics
+    | profile.
+    |
+    */
+
+    'google_analytics_id' => env('GOOGLE_ANALYTICS_ID', null),
+
 ];
diff --git a/database/migrations/2013_09_23_031316_create_track_hashes.php b/database/migrations/2013_09_23_031316_create_track_hashes.php
index 6fe14832..cdfe0323 100644
--- a/database/migrations/2013_09_23_031316_create_track_hashes.php
+++ b/database/migrations/2013_09_23_031316_create_track_hashes.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 class CreateTrackHashes extends Migration
@@ -23,4 +23,4 @@ class CreateTrackHashes extends Migration
             $table->dropColumn('hash');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2014_05_28_071738_update_track_hash.php b/database/migrations/2014_05_28_071738_update_track_hash.php
index 6f2d43bb..c3dca55d 100644
--- a/database/migrations/2014_05_28_071738_update_track_hash.php
+++ b/database/migrations/2014_05_28_071738_update_track_hash.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 class UpdateTrackHash extends Migration
@@ -16,4 +16,4 @@ class UpdateTrackHash extends Migration
     public function down()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2015_05_25_011121_create_track_files_table.php b/database/migrations/2015_05_25_011121_create_track_files_table.php
index 6ac15cd3..53ae5f60 100644
--- a/database/migrations/2015_05_25_011121_create_track_files_table.php
+++ b/database/migrations/2015_05_25_011121_create_track_files_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 
@@ -52,4 +52,4 @@ class CreateTrackFilesTable extends Migration
         Schema::drop('track_files');
     }
 
-}
\ No newline at end of file
+}
diff --git a/resources/assets/scripts/app/app.coffee b/resources/assets/scripts/app/app.coffee
index f130a026..4af1110e 100644
--- a/resources/assets/scripts/app/app.coffee
+++ b/resources/assets/scripts/app/app.coffee
@@ -2,11 +2,12 @@ window.pfm.preloaders = {}
 
 module = angular.module 'ponyfm', ['ui.bootstrap', 'ui.state', 'ui.date', 'ui.sortable', 'pasvaz.bindonce', 'angularytics']
 
-module.run [
-	'Angularytics',
-	(analyitcs) ->
-		analyitcs.init()
-]
+if window.pfm.environment == 'production'
+	module.run [
+		'Angularytics',
+		(analytics) ->
+			analytics.init()
+	]
 
 module.config [
 	'$locationProvider', '$stateProvider', '$dialogProvider', 'AngularyticsProvider', '$httpProvider', '$sceDelegateProvider'
@@ -26,7 +27,8 @@ module.config [
 			'/templates/directives/*'
 		]
 
-		analytics.setEventHandlers ['Google']
+		if window.pfm.environment == 'production'
+			analytics.setEventHandlers ['Google']
 
 		# Errors
 		state.state 'errors-404',
@@ -245,4 +247,4 @@ module.config [
 		$dialogProvider.options
 			dialogFade: true
 			backdropClick: false
-]
\ No newline at end of file
+]
diff --git a/resources/environments/.env.example b/resources/environments/.env.example
index b0321a00..3e28b6b7 100644
--- a/resources/environments/.env.example
+++ b/resources/environments/.env.example
@@ -22,3 +22,5 @@ PONI_CLIENT_ID=null
 PONI_CLIENT_SECRET=null
 
 PONYFM_DATASTORE=null
+
+GOOGLE_ANALYTICS_ID=null
diff --git a/resources/environments/.env.local b/resources/environments/.env.local
index f0f884bf..4b58c75c 100644
--- a/resources/environments/.env.local
+++ b/resources/environments/.env.local
@@ -22,3 +22,5 @@ PONI_CLIENT_ID=
 PONI_CLIENT_SECRET=
 
 PONYFM_DATASTORE=/vagrant-files
+
+GOOGLE_ANALYTICS_ID=UA-29463256-1
diff --git a/resources/environments/.env.production b/resources/environments/.env.production
index bcc7bf00..49e132d8 100644
Binary files a/resources/environments/.env.production and b/resources/environments/.env.production differ
diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage
index 199dcfa4..7f820962 100644
Binary files a/resources/environments/.env.stage and b/resources/environments/.env.stage differ
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 1f0287c5..cb769311 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -32,7 +32,7 @@
 			@if (Auth::check())
 				<div class="user-details dropdown">
 					<a class="avatar dropdown-toggle" href="#">
-						<img src="{{Auth::user()->getAvatarUrl(\App\Image::THUMBNAIL)}}" />
+						<img src="{{Auth::user()->getAvatarUrl(\Poniverse\Ponyfm\Image::THUMBNAIL)}}" />
 						<span><i class="icon-chevron-down"></i></span>
 					</a>
 					<ul class="dropdown-menu">
@@ -112,22 +112,25 @@
 				@else
 					isLogged: false
 				@endif
-			}
+			},
+            environment: "{{ App::environment() }}"
 		};
 	</script>
 
-	<script>
-		{{-- Google Analytics --}}
-		var _gaq = _gaq || [];
-		_gaq.push(['_setAccount', 'UA-29463256-1']);
-		_gaq.push(['_setDomainName', 'pony.fm']);
+    @if(config('ponyfm.google_analytics_id'))
+        <script>
+            {{-- Google Analytics --}}
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', '{{ config('ponyfm.google_analytics_id') }}']);
+            _gaq.push(['_setDomainName', 'pony.fm']);
 
-		(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		})();
-	</script>
+            (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+        </script>
+    @endif
 
 	{!! Assets::scriptIncludes() !!}
 
diff --git a/resources/views/tracks/embed.blade.php b/resources/views/tracks/embed.blade.php
index 060ac374..591cef95 100644
--- a/resources/views/tracks/embed.blade.php
+++ b/resources/views/tracks/embed.blade.php
@@ -26,7 +26,7 @@
 		<div class="player loading {{Auth::check() ? 'can-favourite' : ''}} {{$user['is_favourited'] ? 'favourited' : ''}}" data-track-id="{{ $track->id }}" data-duration="{{ $track->duration * 1000 }}">
 			<div class="play" disabled="disabled">
 				<div class="button"><i class="icon-play"></i></div>
-				<img src="{{ $track->getCoverUrl(\App\Image::SMALL) }}" />
+				<img src="{{ $track->getCoverUrl(\Poniverse\Ponyfm\Image::SMALL) }}" />
 			</div>
 			<div class="meta">
 				@if (Auth::check())
@@ -52,17 +52,19 @@
 
 	{!! Assets::scriptIncludes('embed') !!}
 
-	<script type="text/javascript">
-		var _gaq = _gaq || [];
-		_gaq.push(['_setAccount', 'UA-29463256-1']);
-		_gaq.push(['_setDomainName', 'pony.fm']);
-		_gaq.push(['_trackPageview']);
+    @if(config('ponyfm.google_analytics_id'))
+        <script type="text/javascript">
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', '{{ config('ponyfm.google_analytics_id') }}']);
+            _gaq.push(['_setDomainName', 'pony.fm']);
+            _gaq.push(['_trackPageview']);
 
-		(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		})();
-	</script>
+            (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+        </script>
+    @endif
 </body>
 </html>