Merged master into 1.0.1

client/app/css/battle.styl

@@ -133,6 +133,7 @@ $side-width = ($battle-width - $screen-width) / 2
         &.sand
           background linear-gradient(top, rgba(128, 64, 0, .3), rgba(64, 32, 48, .5))
         &.sun
+          opacity 0.6!important
           background rgba(255, 196, 64, .3)
 
   .battle_pane

client/app/js/models/battles/pokemon.coffee

@@ -268,7 +268,7 @@ class @Pokemon extends Backbone.Model
 
     slugSpecies = slugify(@get('species'))
     slugForme = slugify(@get('forme'))
-    "//pokebattle.com/dex/pokemon/#{slugSpecies}/#{slugForme}"
+    "//wiki.p-insurgence.com/#{slugSpecies}"
 
   getIllu: ->
     @get('illu')