Updating android studio state
Adding composer status helper
Fixing projects state include statement
Fixing bug in marks
Fixing projects.sublime state
Adding siva theme
Disable apport
Disable apport by default
Adding jd => jump alias, fixing rvm load order
Adding some more depth to xdebug config
Naming browse command
Updating xmonad config
Updating sublime text version and adding some theme changes
Merge branch 'master' of github.com:vespakoen/salt-states

Conflicts:
	php/files/xdebug.ini