Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						65eaa60309
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ryanc/dotfiles
						
						
						
						
						
						
						
						Conflicts:
	.bash_profile 
						
						
					 | 
					
						2013-05-25 18:34:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						fb22439b79
					 | 
					
						
						
							
							Added rbenv to bash profile.
						
						
						
						
						
						
					 | 
					
						2013-05-25 18:29:02 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						0c94e49bd1
					 | 
					
						
						
							
							rbenv
						
						
						
						
						
						
					 | 
					
						2013-04-24 07:35:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						90c94f0562
					 | 
					
						
						
							
							Disabled keychain.
						
						
						
						
						
						
					 | 
					
						2012-11-01 10:29:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						a0e20ec4fd
					 | 
					
						
						
							
							Active rvm if present.
						
						
						
						
						
						
					 | 
					
						2012-10-18 17:09:55 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						2eb665d9e7
					 | 
					
						
						
							
							PATH was in the wrong order.
						
						
						
						
						
						
					 | 
					
						2012-10-12 14:11:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						607f5aeedb
					 | 
					
						
						
							
							Added /usr/local/bin to the PATH.
						
						
						
						
						
						
					 | 
					
						2012-10-12 14:09:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ryan Cavicchioni
							
						 
					 | 
					
						
						
							
						
						502fe262b9
					 | 
					
						
						
							
							Added .bash_profile.
						
						
						
						
						
						
					 | 
					
						2012-10-12 14:06:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |