extract() archives - the #html5devconf challenge
Merge branch 'hotfix/remove-unwanted' into develop
Merge pull request #7 from christianv/extract

extract() archives - the #html5devconf challenge
i want me some timestamps in my history file.
i want me some timestamps in my history file.
Merge branch 'master' of https://github.com/paulirish/dotfiles into develop

Conflicts:
	.exports
dim keyboard lights after 60 secs
Gir ignores:

- tincr settings
- Xcode stuff
- flash files
Fixed path
Added bash shortcuts

- wifi on/off/cycle
- bluetooth on/off
- grunt = gr
- lrc folder
- raspberry pi short shortcut
function for low/high power settings/apps
Install grunt function
openmeta tag functions
Merge branch 'develop'