Merge remote-tracking branch 'core/dev' into mergefinal

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.cache
 build
 gh-pages/
 karma.conf.js

.travis.yml

@@ -0,0 +1,30 @@
+language: node_js
+
+node_js:
+  - '0.12'
+
+install:
+  - npm install
+  - ./node_modules/.bin/mozilla-download ./firefox/ --product firefox --branch mozilla-central
+  - export FIREFOX_NIGHTLY_BIN="./firefox/firefox/firefox-bin"
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+script:
+  - $CI_ACTION
+
+env:
+  global:
+    - TEST_SUITE=unit
+  matrix:
+    - CI_ACTION="npm run test:ci"
+    - CI_ACTION="npm run lint"
+    - CI_ACTION="npm run build"
+    - CI_ACTION="npm run dist:js"
+
+branches:
+  only:
+    - master
+    - dev

README.md

@@ -1,9 +1,14 @@
 # A-Frame
 
-> For the core library, check out [A-Frame Core](https://github.com/aframevr/aframe-core/).
-
 __Building blocks for the VR Web.__
 
+[![build status][travis-image]][travis-url]
+[![NPM version][npm-image]][npm-url]
+[![Downloads][downloads-image]][downloads-url]
+[![js-semistandard-style][semistandard-image]][semistandard-url]
+
+A-Frame is a library for creating virtual reality web experiences.
+
 - **Virtual Reality**: Drop in the library and have a WebVR scene within a few lines of markup.
 - **Based on the DOM**: Manipulate with JavaScript, use with your favorite [libraries and frameworks](https://github.com/aframevr/awesome-aframe).
 - **[Entity-Component System](https://aframe.io/docs/core/)**: Use the entity-component system for better composability and flexibility.
@@ -54,18 +59,7 @@ To start the local development server:
 
     npm start
 
-And fire up __[http://localhost:9000](http://localhost:9000)__! Saving local JS and HTML files in `examples/`, `elements/` and so forth will rebuild the bundle and reload the page.
-
-## Browser console logging
-
-If you'd like to see helpful logs, warnings, and errors, you can enable logging from the console of your favourite developer tools:
-
-    localStorage.logs = 1
-
-And to disable:
-
-    localStorage.logs = 0
-
+And fire up __[http://localhost:9000](http://localhost:9000)__!
 
 ## Maintainers
 
@@ -101,3 +95,12 @@ To publish to __https://your_username.github.io/aframe/__:
 ## License
 
 This program is free software and is distributed under an [MIT License](LICENSE).
+
+[npm-image]: https://img.shields.io/npm/v/aframe-core.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/aframe-core
+[travis-image]: https://img.shields.io/travis/aframevr/aframe-core.svg?style=flat-square
+[travis-url]: http://travis-ci.org/aframevr/aframe-core
+[downloads-image]: http://img.shields.io/npm/dm/aframe-core.svg?style=flat-square
+[downloads-url]: https://npmjs.org/package/aframe-core
+[semistandard-image]: https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square
+[semistandard-url]: https://github.com/Flet/semistandard