4 commits

Author	SHA1	Message	Date
Thatcher Peskens	1ddca1948b	Fixed remaining issues and conflicts created by last merge.	2013-04-23 12:04:53 -07:00
Thatcher Peskens	4031a01af1	Merged changes	2013-04-22 18:38:42 -07:00
Thatcher Peskens	6c8dcd5cbb	Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.	2013-04-22 13:10:32 -07:00
Thatcher Peskens	8ecde8f9a5	Updated documentation and fixed Vagrantfile	2013-04-19 20:57:50 -07:00