Merge branch 'master' into work
Update ackrc
Update config files
Keep only one vim opened
Update worker
Update tmux.conf and shrc
Improve tmux config
Add bash_profile
Update link_files script
Add bin scripts
Add rvm tmux and rails tmux
Get rid of rvm+bash hack
Merge branch 'master' into work
Merge branch 'work' of github.com:graudeejs/dot.files into work

Conflicts:
	dot.workrave/state