Working on puppet
Merge branch 'master' of github.com:cbeach/Configurations into puppet
Merge branch 'master' of github.com:cbeach/Configurations into puppet
Merge branch 'master' of github.com:cbeach/Configurations into puppet
Starting puppet manifests

I've started implementing the base class.  The first package has been
added, but it hasn't been tested by applying it yet though.
Merge branch 'master' of github.com:cbeach/Configurations into puppet
Merge branch 'puppet' of github.com:cbeach/Configurations into puppet
Working on the base manifests

◦ Added vim.pp
◦ Working on ssh.pp
Added a TODO list to the puppet modules directory
Puppet

The module writing is coming along nicely.  My laptop is at a bare
minimum usable state (bash, vim, and xmonad custom configurations).
I'm going to start working on the modules that will pretty much end
up being massive piles of related packages.
Puppet Continued

I'm continuing to add modules to puppet.  I've got a few dev tools taken
care of, and will continue to add more as time goes on.

◦ Added the vim-gitgutter project as a submodule.
◦ Added some laptop specifici manifests to puppet.
◦ Added a few things to the dev_tools module, and started on the byobu
  module
I made a new fork of PowerLineShell

◦ I updated this repository to point to the new fork
◦ I'm going to add some zsh specific functionality to it
◦ I'm also going to redesign it to be a little more modular when it
  comes to adding segments.
I've gotten my PowerLineShell Taken care of.

I'm going to implement automatic updates via github service hooks, then
I'll move into a piece-by-piece development schedule. IE creating
manifests when I need them, instead of just installing new software and
being done with it.
Added a few tasks to some TODO lists
Merge branch 'master' of github.com:cbeach/Configurations

Added jsLint submodule, and vim/jslintrc

Conflicts:
	.gitmodules
	puppet/modules/dev
	puppet/modules/dev_tools/manifests/debugging.pp
	puppet/modules/dev_tools/manifests/profiling.pp
	puppet/modules/web/lamp/manifests/init.pp
	puppet/modules/web/lamp/manifests/my_sql.pp
	vim/bundle/PySmell