Merge branch 'master' of github.com:typesettin/periodicjs.ext.default_routes into feature/upstream
Merge pull request #4 from ecasilla/master

Fixed ext.json typo and starting the forking process
made the test instance async
...
Merge branch 'master' of github.com:ecasilla/periodicjs.ext.default_routes into feature/upstream
Merge branch 'master' of github.com:typesettin/periodicjs.ext.default_routes into feature/upstream
Merge branch 'feature/upstream'

Conflicts:
	test/helpers/periodic_instance.js