Merge pull request #1 from drewisme/master

Moar Clusters
Checking OSTYPE for OS X specific commands. Fixing command prompt with history. Adding solr1 to the list of domains
Stoke files, speedtest
New servers at rs
Git aliases
Merge pull request #1 from BigToach/master

Merge