Merge remote-tracking branch 'upstream/master' into take-picture

.gitignore

@@ -26,3 +26,15 @@ server.key
 server.csr
 server.crt
 server.pem
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.h
+config.h.in
+config.status
+configure
+install-sh
+missing
+stamp-h1

Makefile.am

@@ -43,6 +43,8 @@ DIST := $(CURDIR)/dist_$(BUILD_ARCH)
 DIST_SRC := $(DIST)/src
 DIST_BIN := $(DIST)/bin
 
+SASSFLAGS = --style=expanded
+
 # Tools
 AUTOPREFIXER_BROWSER_SUPPORT := "> 1%, last 2 versions, Firefox ESR, Opera 12.1"
 
@@ -79,7 +81,6 @@ test: get
 
 assets: styles javascript
 
-styles: SASSFLAGS = --style=expanded
 styles:
 	$(MKDIR_P) $(CURDIR)/static/css
 	$(MKDIR_P) $(CURDIR)/static/fonts